lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-09-22 13:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve FG Feature checks

Browse Source
This commit is contained in:
cdozdil
2025-10-04 16:38:05 +03:00
parent f9dddac30c
commit 4e5cb63777
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/hooks/FG_Hooks.cpp
+3 -1
View File
@@ -28,14 +28,16 @@ bool CheckForFGStatus()
if (State::Instance().activeFgOutput == FGOutput::FSRFG)
{
FfxApiProxy::InitFfxDx12();
if (FfxApiProxy::IsFGReady())
if (!FfxApiProxy::IsFGReady())
{
LOG_DEBUG("Can't init FfxApiProxy, disabling FGOutput");
Config::Instance()->FGOutput.set_volatile_value(FGOutput::NoFG);
State::Instance().activeFgOutput = Config::Instance()->FGOutput.value_or_default();
}
}
else if (State::Instance().activeFgOutput == FGOutput::XeFG && !XeFGProxy::InitXeFG())
{
LOG_DEBUG("Can't init XeFGProxy, disabling FGOutput");
Config::Instance()->FGOutput.set_volatile_value(FGOutput::NoFG);
State::Instance().activeFgOutput = Config::Instance()->FGOutput.value_or_default();
}
OptiScaler/menu/menu_common.cpp
+12 -18
View File
@@ -2808,11 +2808,6 @@ bool MenuCommon::RenderMenu()
//}
// else if (State::Instance().api != DX12)
if (State::Instance().api != DX12)
{
disabledMaskInput[optiFgIndex] = true;
fgInputDesc[optiFgIndex] = "Old overlay menu is unsupported";
}
else if (State::Instance().api != DX12)
{
disabledMaskInput[optiFgIndex] = true;
fgInputDesc[optiFgIndex] = "Unsupported API";
@@ -2822,20 +2817,20 @@ bool MenuCommon::RenderMenu()
disabledMaskInput[optiFgIndex] = true;
fgInputDesc[optiFgIndex] = "Unsupported Opti working mode";
}
else if (State::Instance().activeFgOutput == FGOutput::FSRFG &&
((fsr31InitTried && !FfxApiProxy::IsFGReady()) ||
(!fsr31InitTried && (!FfxApiProxy::InitFfxDx12()) || !FfxApiProxy::IsFGReady())))
else if (State::Instance().activeFgOutput == FGOutput::FSRFG && !FfxApiProxy::IsFGReady() &&
!fsr31InitTried)
{
fsr31InitTried = true;
disabledMaskInput[optiFgIndex] = true;
FfxApiProxy::InitFfxDx12();
disabledMaskInput[optiFgIndex] = !FfxApiProxy::IsFGReady();
fgInputDesc[optiFgIndex] = "amd_fidelityfx_dx12.dll is missing";
}
else if (State::Instance().activeFgOutput == FGOutput::XeFG &&
((xefgInitTried && XeFGProxy::Module() == nullptr) ||
(!xefgInitTried && !XeFGProxy::InitXeFG())))
else if (State::Instance().activeFgOutput == FGOutput::XeFG && !xefgInitTried &&
XeFGProxy::Module() == nullptr)
{
xefgInitTried = true;
disabledMaskInput[optiFgIndex] = true;
XeFGProxy::InitXeFG();
disabledMaskInput[optiFgIndex] = XeFGProxy::Module() == nullptr;
fgInputDesc[optiFgIndex] = "libxess_fg.dll is missing";
}
@@ -3069,7 +3064,7 @@ bool MenuCommon::RenderMenu()
State::Instance().api == DX12)
{
if (State::Instance().activeFgInput != FGInput::Upscaler ||
(currentFeature != nullptr && !currentFeature->IsFrozen()) && FfxApiProxy::InitFfxDx12())
(currentFeature != nullptr && !currentFeature->IsFrozen()) && FfxApiProxy::IsFGReady())
{
ImGui::SeparatorText("Frame Generation (FSR FG)");
@@ -3082,7 +3077,6 @@ bool MenuCommon::RenderMenu()
if (Config::Instance()->FGEnabled.value_or_default())
State::Instance().FGchanged = true;
}
ShowHelpMarker("Enable frame generation");
bool fgAsync = Config::Instance()->FGAsync.value_or_default();
@@ -3196,7 +3190,7 @@ bool MenuCommon::RenderMenu()
auto fg = State::Instance().currentFG;
if (fg != nullptr && strcmp(fg->Name(), "FSR-FG") == 0 &&
FfxApiProxy::VersionDx12() >= feature_version { 3, 1, 3 })
FfxApiProxy::VersionDx12_FG() >= feature_version { 3, 1, 3 })
{
ImGui::Spacing();
if (ImGui::TreeNode("Frame Pacing Tuning"))
@@ -3443,7 +3437,7 @@ bool MenuCommon::RenderMenu()
{
SeparatorWithHelpMarker("Frame Generation (OptiFG)", "Using upscaler data for FG");
if (currentFeature != nullptr && !currentFeature->IsFrozen() && FfxApiProxy::InitFfxDx12())
if (currentFeature != nullptr && !currentFeature->IsFrozen() && FfxApiProxy::IsFGReady())
{
bool fgHudfix = Config::Instance()->FGHUDFix.value_or_default();
bool disableHudfix = static_cast<bool>(State::Instance().gameQuirks & GameQuirk::DisableHudfix);
@@ -3650,7 +3644,7 @@ bool MenuCommon::RenderMenu()
{
ImGui::Text("Upscaler is not active"); // Probably never will be visible
}
else if (!FfxApiProxy::InitFfxDx12())
else if (!FfxApiProxy::IsFGReady())
{
ImGui::TextColored({ 1.0f, 0.0f, 0.0f, 1.0f },
"amd_fidelityfx_dx12.dll is missing!"); // Probably never will be visible
OptiScaler/proxies/FfxApi_Proxy.h
+2 -1
View File
@@ -201,7 +201,8 @@ class FfxApiProxy
InitFfxDx12_SR();
InitFfxDx12_FG();
bool loadResult = _D3D12_CreateContext != nullptr;
bool loadResult =
_D3D12_CreateContext != nullptr || _D3D12_CreateContext_SR != nullptr || _D3D12_CreateContext_FG != nullptr;
LOG_INFO("LoadResult: {}", loadResult);