lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-23 14:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Overlay info additions and cleanup

Browse Source
This commit is contained in:
TheRazerMD
2026-08-11 13:49:03 +02:00
parent a2b3418e0c
commit c5d237f562
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/menu/menu_common.cpp
+39 -39
View File
@@ -2666,7 +2666,7 @@ void MenuCommon::RenderActiveUpscalerSettings(RenderMenuContext& ctx)
config->Fsr4EnableWatermark = fsr4wm;
}
ShowHelpMarker("After changing this option, please Save Settings\n"
ShowHelpMarker("After changing this option, please Save Settings.\n"
"It will be applied on next launch.");
}
}
@@ -2751,7 +2751,7 @@ void MenuCommon::RenderActiveUpscalerSettings(RenderMenuContext& ctx)
ShowHelpMarker("Value of 0.0f can improve temporal stability of bright pixels\n"
"Lower values are more stable with ghosting\n"
"Higher values are more pixelly but less ghosting.");
"Higher values are more pixelly, but less ghosting");
if (currentFeature->Version() >= feature_version { 3, 1, 4 })
{
@@ -2862,7 +2862,7 @@ void MenuCommon::RenderActiveUpscalerSettings(RenderMenuContext& ctx)
ShowHelpMarker("Each render preset has it strengths and weaknesses\n"
"Override to potentially improve image quality\n"
"Press apply after enable/disable");
"Press Apply after enable/disable");
/*
auto currentPresetIndex = GetPresetIndex(currentFeature, false);
@@ -2918,7 +2918,7 @@ void MenuCommon::RenderActiveUpscalerSettings(RenderMenuContext& ctx)
ShowHelpMarker("Use generic appid with NGX\n"
"Fixes OptiScaler preset override not working with certain games\n"
"Requires a game restart.");
"Requires a game restart");
ImGui::BeginDisabled(!config->RenderPresetOverride.value_or_default() || overridden);
ImGui::Spacing();
@@ -2969,16 +2969,16 @@ void MenuCommon::RenderFrameGenerationSelection(RenderMenuContext& ctx)
inputOptions = {
{ FGInput::NoFG, "None" },
{ FGInput::NvngxFG, "Nukem's/Artur's DLSSG",
"Limited to FSR3-FG\n\nSupports Hudless out of the box\n\nUses Streamline swapchain for pacing" },
"Limited to FSR3-FG\n\nRequires enabling DLSS-FG in game settings\nSupports HUDless out of the box\nUses Streamline swapchain for pacing" },
{ FGInput::FSRFG, "FSR 3.1 FG",
"Can be used with any FG Output\n\nSupports Hudless out of the box" },
"Can be used with any FG Output\n\nRequires enabling FSR-FG in game settings\nSupports HUDless out of the box" },
{ FGInput::DLSSG, "DLSSG via Streamline",
"Can be used with any FG Output\n\nSupports Hudless out of the box" },
"Can be used with any FG Output\n\nRequires enabling DLSS-FG in game settings\nSupports HUDless out of the box\n\nLimited to games that use Streamline v2" },
{ FGInput::XeFG, "XeFG" },
{ FGInput::Upscaler, "OptiFG (Upscaler)",
"Upscaler must be enabled\n\nCan be used with any FG Output, but might be imperfect with some\n\nTo prevent UI glitching, HUDfix required" },
"Upscaler must be enabled\n\nCan be used with any FG Output, but might be imperfect with some\nTo prevent UI glitching, HUDfix required" },
{ FGInput::FSRFG30, "FSR 3.0 FG",
"Can be used with any FG Output\n\nSupports Hudless out of the box" }
"Can be used with any FG Output\n\nRequires enabling FSR-FG in game settings\nSupports HUDless out of the box" }
};
// clang-format on
@@ -2994,7 +2994,7 @@ void MenuCommon::RenderFrameGenerationSelection(RenderMenuContext& ctx)
// XeFG input requirements
auto constexpr xefgInputIndex = (uint32_t) FGInput::XeFG;
inputOptions[xefgInputIndex].set_disabled(true, "Support not implemented");
inputOptions[xefgInputIndex].set_disabled(true, "Support not implemented, they meant FG Output");
// OptiFG requirements
auto constexpr optiFgIndex = (uint32_t) FGInput::Upscaler;
@@ -3039,10 +3039,10 @@ void MenuCommon::RenderFrameGenerationSelection(RenderMenuContext& ctx)
outputOptions = {
{ FGOutput::NoFG, "None" },
{ FGOutput::NvngxFG, "FSR3-FG Nukem/Enabler", "Uses Game's DLSSG implementation.\nEnable DLSS-FG in-game" },
{ FGOutput::FSRFG, "FSR FG", "FSR3/4 FG" },
{ FGOutput::NvngxFG, "FSR3-FG Nukem/Enabler", "Uses Game's DLSSG implementation.\nEnable DLSS-FG in-game\n\nNukems - lightest, but most artifacts (esp. in fast motion)" },
{ FGOutput::FSRFG, "FSR FG", "FSR3/4-FG, RDNA4 autoupgrades to FSR4-FG\n\nFSR4-FG sometimes better/worse than XeFG" },
{ FGOutput::DLSSG, "DLSSG", "For 40xx and above" },
{ FGOutput::XeFG, "XeFG", "XeFG" },
{ FGOutput::XeFG, "XeFG", "XeFG - heaviest, but best universal FG\n\nXeFG 3 overall deals best with HUD\n\nEnable UI Composition if HUD ghosting" },
{ FGOutput::DLSSGWithNvngx, "DLSSG with Nvngx FG", "Uses Opti's own DLSSG instance and adds NvngxFG on top\nDo not use if a game already has DLSSG\n\nIf a game has DLSSG then use the FG Input option:\n\"Nukem's/Artur's DLSSG\"" }
};
@@ -3572,7 +3572,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
ImGui::Spacing();
if (auto ch = ScopedCollapsingHeader("Advanced FSR FG Settings"); ch.IsHeaderOpen())
if (auto ch = ScopedCollapsingHeader("Extended FSR FG Settings"); ch.IsHeaderOpen())
{
ScopedIndent indent {};
ImGui::Spacing();
@@ -3873,7 +3873,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
// ShowHelpMarker("Display only XeFG generated frames");
ImGui::Spacing();
if (auto ch = ScopedCollapsingHeader("Advanced XeFG Settings"); ch.IsHeaderOpen())
if (auto ch = ScopedCollapsingHeader("Extended XeFG Settings"); ch.IsHeaderOpen())
{
ImGui::Spacing();
if (ImGui::TreeNode("Rectangle Settings"))
@@ -4085,7 +4085,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
LOG_DEBUG("Enabled set FGHUDFixExtended: {}", hudExtended);
config->FGHUDFixExtended = hudExtended;
}
ShowHelpMarker("Extended format checks for possible Hudless\nMight cause crashes and slowdowns!");
ShowHelpMarker("Extended format checks for possible HUDless\nMight cause crashes and slowdowns!");
ImGui::SameLine(0.0f, 16.0f);
ImGui::BeginDisabled(!config->FGHUDFix.value_or_default());
@@ -4096,7 +4096,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
LOG_DEBUG("Enabled set FGImmediateCapture: {}", immediate);
config->FGImmediateCapture = immediate;
}
ShowHelpMarker("Enables capturing of resources before shader execution.\nIncrease Hudless "
ShowHelpMarker("Enables capturing of resources before shader execution.\nIncrease HUDless "
"capture chances, but might cause capturing of unnecessary resources.");
ImGui::PopItemWidth();
@@ -4138,7 +4138,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
config->FGResourceBlocking = rb;
LOG_DEBUG("Enabled set FGResourceBlocking: {}", rb);
}
ShowHelpMarker("Block rarely used resources from using as Hudless \n"
ShowHelpMarker("Block rarely used resources from using as HUDless \n"
"to prevent flickers and other issues\n\n"
"HUDfix enable/disable will reset the block list!");
@@ -4150,7 +4150,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
config->FGRelaxedResolutionCheck = rrc;
LOG_DEBUG("Enabled set FGRelaxedResolutionCheck: {}", rrc);
}
ShowHelpMarker("Relax resolution checks for Hudless by 32 pixels \n"
ShowHelpMarker("Relax resolution checks for HUDless by 32 pixels \n"
"Helps games which use black borders for some \n"
"resolutions and screen ratios (e.g. Witcher 3)");
@@ -4208,7 +4208,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable RTV Tracking", &disableRTV))
config->FGHudfixDisableRTV = disableRTV;
ShowHelpMarker("Disable tracking of CreateRenderTargetView\n"
"This might help filtering of wrong hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::SameLine(0.0f, 16.0f);
@@ -4216,13 +4216,13 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable SRV Tracking", &disableSRV))
config->FGHudfixDisableSRV = disableSRV;
ShowHelpMarker("Disable tracking of CreateShaderResourceView\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
auto disableUAV = config->FGHudfixDisableUAV.value_or_default();
if (ImGui::Checkbox("Disable UAV Tracking", &disableUAV))
config->FGHudfixDisableUAV = disableUAV;
ShowHelpMarker("Disable tracking of CreateUnorderedAccessView\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::SameLine(0.0f, 16.0f);
@@ -4230,13 +4230,13 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable OM Tracking", &disableOM))
config->FGHudfixDisableOM = disableOM;
ShowHelpMarker("Disable tracking of OMSetRenderTargets\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
auto disableSCR = config->FGHudfixDisableSCR.value_or_default();
if (ImGui::Checkbox("Disable SCR Tracking", &disableSCR))
config->FGHudfixDisableSCR = disableSCR;
ShowHelpMarker("Disable tracking of SetComputeRootDescriptorTable\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::SameLine(0.0f, 16.0f);
@@ -4244,7 +4244,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable SGR Tracking", &disableSGR))
config->FGHudfixDisableSGR = disableSGR;
ShowHelpMarker("Disable tracking of SetGraphicsRootDescriptorTable\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::Spacing();
@@ -4252,7 +4252,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable DI Tracking", &disableDI))
config->FGHudfixDisableDI = disableDI;
ShowHelpMarker("Disable tracking of DrawInstanced\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::SameLine(0.0f, 16.0f);
@@ -4260,13 +4260,13 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (ImGui::Checkbox("Disable DII Tracking", &disableDII))
config->FGHudfixDisableDII = disableDII;
ShowHelpMarker("Disable tracking of DrawIndexedInstanced\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
auto disableDispatch = config->FGHudfixDisableDispatch.value_or_default();
if (ImGui::Checkbox("Disable Dispatch Tracking", &disableDispatch))
config->FGHudfixDisableDispatch = disableDispatch;
ShowHelpMarker("Disable tracking of Dispatch\n"
"This might help filtering of wrong Hudless resources");
"This might help filtering of wrong HUDless resources");
ImGui::TreePop();
}
@@ -4416,7 +4416,7 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
if (Nvngx_FG::isLoaded(state.swapchainApi))
{
if (bool disableHudless = config->NvngxFGDisableHudless.value_or_default();
ImGui::Checkbox("Disable Hudless", &disableHudless))
ImGui::Checkbox("Disable HUDless", &disableHudless))
{
config->NvngxFGDisableHudless = disableHudless;
}
@@ -4529,18 +4529,18 @@ void MenuCommon::RenderFrameGenerationRuntimeSettings(RenderMenuContext& ctx)
}
bool skipConfig = config->FSRFGSkipConfigForHudless.value_or_default();
if (ImGui::Checkbox("Skip Config for Hudless", &skipConfig))
if (ImGui::Checkbox("Skip Config for HUDless", &skipConfig))
config->FSRFGSkipConfigForHudless = skipConfig;
ShowHelpMarker("Do not use Hudless set at ffxConfig");
ShowHelpMarker("Do not use HUDless set at ffxConfig");
ImGui::SameLine(0.0f, 6.0f);
bool skipDispatch = config->FSRFGSkipDispatchForHudless.value_or_default();
if (ImGui::Checkbox("Skip Dispatch for Hudless", &skipDispatch))
if (ImGui::Checkbox("Skip Dispatch for HUDless", &skipDispatch))
config->FSRFGSkipDispatchForHudless = skipDispatch;
ShowHelpMarker("Do not use Hudless set at ffxDispatch");
ShowHelpMarker("Do not use HUDless set at ffxDispatch");
}
// Streamline FG Inputs
@@ -5352,11 +5352,11 @@ void MenuCommon::RenderActiveImageSettings(RenderMenuContext& ctx)
{ Scaler::Lanczos2, "Lanczos2",
"Lighter and faster than Lanczos3.\nLess prone to ringing artefacts, but slightly blurrier." },
{ Scaler::Lanczos3, "Lanczos3",
"Heavier version of Lanczos2.\nOffers the sharpest image, but is the most prone to ringing." },
"Heavier version of Lanczos2.\nOffers the sharpest image, but is the most prone to ringing.\nConsidered the best along with Kaiser3." },
{ Scaler::Kaiser2, "Kaiser2",
"Similar to Lanczos2.\nSmoother and less prone to artefacts than Lanczos, but slightly blurrier." },
{ Scaler::Kaiser3, "Kaiser3",
"Similar to Lanczos3.\nFar less prone to artefacting than Lanczos3, but much heavier on the GPU." },
"Similar to Lanczos3.\nFar less prone to artefacting than Lanczos3, but much heavier on the GPU.\nConsidered the best along with Lanczos3." },
{ Scaler::Magic, "MAGIC",
"Specialised to prevent artifacts.\nEliminates harsh halos for a natural look, but can appear slightly soft." }
};
@@ -7090,14 +7090,14 @@ void MenuCommon::RenderHudlessResourcesWindow(RenderMenuContext& ctx, ImGuiWindo
ImGui::SetNextWindowPos(ImVec2 { posX, posY }, ImGuiCond_FirstUseEver);
ImGui::SetNextWindowSize(ImVec2 { 400.0f, 300.0f });
if (ImGui::Begin("Hudless Resources", nullptr, flags))
if (ImGui::Begin("HUDless Resources", nullptr, flags))
{
if (!ImGui::IsWindowFocused(ImGuiFocusedFlags_AnyWindow))
ImGui::SetWindowFocus();
int btnCount = 100;
if (ImGui::BeginTable("HudlessTable", 2, ImGuiTableFlags_SizingFixedFit))
if (ImGui::BeginTable("HUDlessTable", 2, ImGuiTableFlags_SizingFixedFit))
{
ImGui::TableSetupColumn("##1", ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("##2", ImGuiTableColumnFlags_WidthFixed);
@@ -7127,7 +7127,7 @@ void MenuCommon::RenderHudlessResourcesWindow(RenderMenuContext& ctx, ImGuiWindo
if (ImGui::Button(text.c_str()))
{
LOG_DEBUG("Hudless {:X}: {}", (size_t) it->first,
LOG_DEBUG("HUDless {:X}: {}", (size_t) it->first,
it->second.enabled ? "Disabling" : "Enabling");
it->second.enabled = !it->second.enabled;
}
@@ -7138,7 +7138,7 @@ void MenuCommon::RenderHudlessResourcesWindow(RenderMenuContext& ctx, ImGuiWindo
if (ImGui::Button("Clear##4"))
{
LOG_DEBUG("Clearing captured hudless resources");
LOG_DEBUG("Clearing captured HUDless resources");
state.clearCapturedHudlesses = true;
}