mirror of
https://github.com/optiscaler/OptiScaler.git
synced 2026-11-22 13:47:11 +00:00
Updated FSR3.1 preset values (thanks weathertop)
This commit is contained in:
1 parent
a54ce46fa4
commit
2df7ad9f2c
4 files changed
+13
-85
No files matched your search
+5
-5
@@ -580,12 +580,12 @@ class Config
|
||||
CustomOptional<bool> FsrNonLinearPQ { false };
|
||||
CustomOptional<bool> FsrAgilitySDKUpgrade { false };
|
||||
|
||||
// These default values will be overwritten at upscaler init time with optimized values
|
||||
CustomOptional<float> FsrVelocity { 1.0f };
|
||||
CustomOptional<float> FsrReactiveScale { 1.0f };
|
||||
CustomOptional<float> FsrShadingScale { 1.0f };
|
||||
// Stability preset values
|
||||
CustomOptional<float> FsrVelocity { 0.5f };
|
||||
CustomOptional<float> FsrReactiveScale { 0.333f };
|
||||
CustomOptional<float> FsrShadingScale { 0.5f };
|
||||
CustomOptional<float> FsrAccAddPerFrame { 0.333f };
|
||||
CustomOptional<float> FsrMinDisOccAcc { -0.333f };
|
||||
CustomOptional<float> FsrMinDisOccAcc { 0.0f };
|
||||
|
||||
// FSR4
|
||||
// Overrides the FSR 4 support detected for the GPU
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user