diff --git a/OptiScaler/Config.h b/OptiScaler/Config.h index 9d1aa158..48632183 100644 --- a/OptiScaler/Config.h +++ b/OptiScaler/Config.h @@ -580,12 +580,12 @@ class Config CustomOptional FsrNonLinearPQ { false }; CustomOptional FsrAgilitySDKUpgrade { false }; - // These default values will be overwritten at upscaler init time with optimized values - CustomOptional FsrVelocity { 1.0f }; - CustomOptional FsrReactiveScale { 1.0f }; - CustomOptional FsrShadingScale { 1.0f }; + // Stability preset values + CustomOptional FsrVelocity { 0.5f }; + CustomOptional FsrReactiveScale { 0.333f }; + CustomOptional FsrShadingScale { 0.5f }; CustomOptional FsrAccAddPerFrame { 0.333f }; - CustomOptional FsrMinDisOccAcc { -0.333f }; + CustomOptional FsrMinDisOccAcc { 0.0f }; // FSR4 // Overrides the FSR 4 support detected for the GPU diff --git a/OptiScaler/menu/menu_common.cpp b/OptiScaler/menu/menu_common.cpp index 55f72413..4e6dea62 100644 --- a/OptiScaler/menu/menu_common.cpp +++ b/OptiScaler/menu/menu_common.cpp @@ -4226,42 +4226,22 @@ void MenuCommon::RenderActiveUpscalerSettings(RenderMenuContext& ctx) // This will be applied by default if (ImGui::Button("Stability")) { - auto const scaleRatioX = - (float) currentFeature->TargetWidth() / (float) currentFeature->RenderWidth(); - auto const scaleRatioY = - (float) currentFeature->TargetHeight() / (float) currentFeature->RenderHeight(); - auto const scaleRatio = std::max(scaleRatioX, scaleRatioY); - config->FsrVelocity = 0.5f; - config->FsrReactiveScale = 0.25f; - - config->FsrShadingScale.reset(); - config->FsrAccAddPerFrame.reset(); - config->FsrMinDisOccAcc.reset(); - config->FsrShadingScale.set_volatile_value(0.5f / scaleRatio); - config->FsrAccAddPerFrame.set_volatile_value(scaleRatio / 10.0f); - config->FsrMinDisOccAcc.set_volatile_value(scaleRatio / 20.0f); + config->FsrReactiveScale = 0.333f; + config->FsrShadingScale = 0.5f; + config->FsrAccAddPerFrame = 0.333f; + config->FsrMinDisOccAcc = 0.0f; } ImGui::SameLine(0.0f, 6.0f); if (ImGui::Button("Motion")) { - auto const scaleRatioX = - (float) currentFeature->TargetWidth() / (float) currentFeature->RenderWidth(); - auto const scaleRatioY = - (float) currentFeature->TargetHeight() / (float) currentFeature->RenderHeight(); - auto const scaleRatio = std::max(scaleRatioX, scaleRatioY); - config->FsrVelocity = 1.0f; - config->FsrReactiveScale = 0.5f; - - config->FsrShadingScale.reset(); - config->FsrAccAddPerFrame.reset(); - config->FsrMinDisOccAcc.reset(); - config->FsrShadingScale.set_volatile_value(1.0f / scaleRatio); - config->FsrAccAddPerFrame.set_volatile_value(scaleRatio / 10.0f); - config->FsrMinDisOccAcc.set_volatile_value(scaleRatio / 20.0f); + config->FsrReactiveScale = 0.666f; + config->FsrShadingScale = 1.0f; + config->FsrAccAddPerFrame = 0.166f; + config->FsrMinDisOccAcc = 0.0f; } ImGui::SameLine(0.0f, 6.0f); diff --git a/OptiScaler/upscalers/ffx/FFXFeature.cpp b/OptiScaler/upscalers/ffx/FFXFeature.cpp index 2d81956f..14a63270 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature.cpp @@ -277,32 +277,6 @@ void FFXFeature::InitFlags() _contextDesc.maxUpscaleSize.width = TargetWidth(); _contextDesc.maxUpscaleSize.height = TargetHeight(); } - - // Set stability values as default if not set by user - { - auto config = Config::Instance(); - auto const scaleRatioX = (float) TargetWidth() / (float) RenderWidth(); - auto const scaleRatioY = (float) TargetHeight() / (float) RenderHeight(); - auto const scaleRatio = std::max(scaleRatioX, scaleRatioY); - - if (scaleRatio > 0.0f && !std::isinf(scaleRatio)) - { - if (config->FsrVelocity.value_for_config() == std::nullopt) - config->FsrVelocity.set_volatile_value(0.5f); - - if (config->FsrReactiveScale.value_for_config() == std::nullopt) - config->FsrReactiveScale.set_volatile_value(0.25f); - - if (config->FsrShadingScale.value_for_config() == std::nullopt) - config->FsrShadingScale.set_volatile_value(0.5f / scaleRatio); - - if (config->FsrAccAddPerFrame.value_for_config() == std::nullopt) - config->FsrAccAddPerFrame.set_volatile_value(scaleRatio / 10.0f); - - if (config->FsrMinDisOccAcc.value_for_config() == std::nullopt) - config->FsrMinDisOccAcc.set_volatile_value(scaleRatio / 20.0f); - } - } } FFXFeature::FFXFeature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp b/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp index 7ff1e345..f7881624 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp +++ b/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp @@ -539,32 +539,6 @@ bool FSR31FeatureDx11::InitFSR3(const NVSDK_NGX_Parameter* InParameters) _upscalerContextDesc.maxUpscaleSize.height = TargetHeight(); } - // Set stability values as default if not set by user - { - auto config = Config::Instance(); - auto const scaleRatioX = (float) TargetWidth() / (float) RenderWidth(); - auto const scaleRatioY = (float) TargetHeight() / (float) RenderHeight(); - auto const scaleRatio = std::max(scaleRatioX, scaleRatioY); - - if (scaleRatio > 0.0f && !std::isinf(scaleRatio)) - { - if (config->FsrVelocity.value_for_config() == std::nullopt) - config->FsrVelocity.set_volatile_value(0.5f); - - if (config->FsrReactiveScale.value_for_config() == std::nullopt) - config->FsrReactiveScale.set_volatile_value(0.25f); - - if (config->FsrShadingScale.value_for_config() == std::nullopt) - config->FsrShadingScale.set_volatile_value(0.5f / scaleRatio); - - if (config->FsrAccAddPerFrame.value_for_config() == std::nullopt) - config->FsrAccAddPerFrame.set_volatile_value(scaleRatio / 10.0f); - - if (config->FsrMinDisOccAcc.value_for_config() == std::nullopt) - config->FsrMinDisOccAcc.set_volatile_value(scaleRatio / 20.0f); - } - } - LOG_DEBUG("_createContext!"); auto ret = ffxFsr3ContextCreate(&_upscalerContext, &_upscalerContextDesc);