diff --git a/OptiScaler.ini b/OptiScaler.ini index 8b5d170a..61ad442b 100644 --- a/OptiScaler.ini +++ b/OptiScaler.ini @@ -59,7 +59,7 @@ HUDFixExtended=auto ; Enables capturing of resources before shader execution. ; Increase hudless capture chances but might cause capturing of unnecessary resources. ; true or false - Default (auto) is false -HUDFixImmadiate=auto +HUDFixImmediate=auto ; Release present sync mutex after presenting 1 frame ; true or false - Default (auto) is false @@ -301,7 +301,7 @@ ReactiveScale=auto ShadingScale=auto ; Sets accumulation added per frame for FSR3.1.4 and above -; Corresponds to amount of accumulation added per frame at pixel coordinate where disocclusion occured or when reactive mask value is > 0.0f. +; Corresponds to amount of accumulation added per frame at pixel coordinate where disocclusion occurred or when reactive mask value is > 0.0f. ; Decreasing this and drawing the ghosting object (IE no mv) to reactive mask with value close to 1.0f can decrease temporal ghosting. ; Decreasing this value could result in more thin feature pixels flickering. ; 0.0 to 1.0 - Default (auto) is 0.333 @@ -435,7 +435,7 @@ ShortcutKey=auto ExtendedLimits=auto ; Use high quality font for menu -; Might use less VRAM +; Might use more VRAM ; If you see a black overlay or experience menu related crashes with Vulkan, try disabling ; true or false - Default (auto) is true UseHQFont=auto @@ -488,7 +488,7 @@ FpsOverlayAlpha=auto [Spoofing] ; ------------------------------------------------------- ; VerdorId to spoof -; 0x10de = Nvidia | 0x8086 = Intel | 0x0x1002 = AMD +; 0x10de = Nvidia | 0x8086 = Intel | 0x1002 = AMD ; Integer value - Default (auto) is 0x10de SpoofedVendorId=auto @@ -507,7 +507,7 @@ TargetDeviceId=auto ; Spoofed GPU name ; NVIDIA GeForce RTX 4090 | Intel(R) Arc(TM) A770 Graphics | AMD Radeon RX 9070 XT -; Integer value - Default (auto) is NVIDIA GeForce RTX 4090 +; Default (auto) is NVIDIA GeForce RTX 4090 SpoofedGPUName=auto ; Enables Nvidia GPU spoofing for DXGI @@ -536,7 +536,7 @@ VulkanExtensionSpoofing=auto VulkanVRAM=auto ; Enables spoofing of hardware accelerated gpu scheduling -; Required for nukem's mod, let's RTX40xx series users use DLSSG without HAGS enabled +; Required for nukem's mod, lets RTX40xx series users use DLSSG without HAGS enabled ; true or false - Default (auto) is false, unless DLSSG mod is enabled SpoofHAGS=auto @@ -583,7 +583,7 @@ LoadReshade=auto ; true or false - Default (auto) is false for Nvidia, true for others OverrideNvapiDll=auto -; Disable FlipMatering +; Disable FlipMetering ; Fix the thick frametime graph caused by Nvidia's Flip Metering when using NukemFG, needs Fakenvapi to work ; true or false - Default (auto) is false for Nvidia, true for others DisableFlipMetering=auto @@ -688,6 +688,17 @@ MotionScaleLimit=auto ; true or false - Default (auto) is false MotionSharpnessDebug=auto +; Enable Contrast based sharpening +; Increases sharpness at high contrast areas. +; true or false - Default (auto) is false +ContrastEnabled=auto + +; Contrast based sharpening value +; Higher values increases sharpness at high contrast areas. +; High values might cause graphical GLITCHES when used with high sharpness values !!! +; 0.0 - 2.0 - Default (auto) is 0.0 +Contrast=auto + ; ------------------------------------------------------- @@ -888,25 +899,15 @@ UsePrecompiledShaders=auto ; Color texture resource state to fix for rainbow colors on AMD cards (for mostly UE games) ; For UE engine games on AMD, set it to 4 (D3D12_RESOURCE_STATE_RENDER_TARGET) -; Default (auto) is state correction disabled ColorResourceBarrier=auto - -; Default (auto) is state correction disabled ; For UE engine games on AMD, set it to 8 (D3D12_RESOURCE_STATE_UNORDERED_ACCESS) MotionVectorResourceBarrier=auto - -; Default (auto) is state correction disabled DepthResourceBarrier=auto - -; Default (auto) is state correction disabled ColorMaskResourceBarrier=auto - -; Default (auto) is state correction disabled ExposureResourceBarrier=auto - -; Default (auto) is state correction disabled OutputResourceBarrier=auto +; Default (auto) is state correction disabled ; These settings defines each resources initial resource ; state and add resource barrier for correct state ; diff --git a/OptiScaler/Config.cpp b/OptiScaler/Config.cpp index d9c8d05c..37e52bd8 100644 --- a/OptiScaler/Config.cpp +++ b/OptiScaler/Config.cpp @@ -74,7 +74,7 @@ bool Config::Reload(std::filesystem::path iniPath) FGHUDFix.set_from_config(readBool("OptiFG", "HUDFix")); FGHUDLimit.set_from_config(readInt("OptiFG", "HUDLimit")); FGHUDFixExtended.set_from_config(readBool("OptiFG", "HUDFixExtended")); - FGImmediateCapture.set_from_config(readBool("OptiFG", "HUDFixImmadiate")); + FGImmediateCapture.set_from_config(readBool("OptiFG", "HUDFixImmediate")); FGRectLeft.set_from_config(readInt("OptiFG", "RectLeft")); FGRectTop.set_from_config(readInt("OptiFG", "RectTop")); FGRectWidth.set_from_config(readInt("OptiFG", "RectWidth")); @@ -413,7 +413,7 @@ bool Config::Reload(std::filesystem::path iniPath) // Inputs { - EnableDlssInputs.set_from_config(readBool("Inputs", "EnableDlssEnable")); + EnableDlssInputs.set_from_config(readBool("Inputs", "EnableDlssInputs")); EnableXeSSInputs.set_from_config(readBool("Inputs", "EnableXeSSInputs")); EnableFsr2Inputs.set_from_config(readBool("Inputs", "EnableFsr2Inputs")); @@ -614,7 +614,7 @@ bool Config::SaveIni() ini.SetValue("OptiFG", "HUDFix", GetBoolValue(Instance()->FGHUDFix.value_for_config()).c_str()); ini.SetValue("OptiFG", "HUDLimit", GetIntValue(Instance()->FGHUDLimit.value_for_config()).c_str()); ini.SetValue("OptiFG", "HUDFixExtended", GetBoolValue(Instance()->FGHUDFixExtended.value_for_config()).c_str()); - ini.SetValue("OptiFG", "HUDFixImmadiate", + ini.SetValue("OptiFG", "HUDFixImmediate", GetBoolValue(Instance()->FGImmediateCapture.value_for_config()).c_str()); ini.SetValue("OptiFG", "RectLeft", GetIntValue(Instance()->FGRectLeft.value_for_config()).c_str()); ini.SetValue("OptiFG", "RectTop", GetIntValue(Instance()->FGRectTop.value_for_config()).c_str()); @@ -624,7 +624,7 @@ bool Config::SaveIni() GetBoolValue(Instance()->FGAlwaysTrackHeaps.value_for_config()).c_str()); ini.SetValue("OptiFG", "MakeDepthCopy", GetBoolValue(Instance()->FGMakeDepthCopy.value_for_config()).c_str()); ini.SetValue("OptiFG", "MakeMVCopy", GetBoolValue(Instance()->FGMakeMVCopy.value_for_config()).c_str()); - ini.SetValue("OptiFG", "UseMutexForSwaphain", + ini.SetValue("OptiFG", "UseMutexForSwapchain", GetBoolValue(Instance()->FGUseMutexForSwapchain.value_for_config()).c_str()); ini.SetValue("OptiFG", "EnableDepthScale", @@ -717,7 +717,7 @@ bool Config::SaveIni() wstring_to_string(Instance()->NvngxPath.value_for_config_or(L"auto")).c_str()); ini.SetValue("DLSS", "FeaturePath", wstring_to_string(Instance()->DLSSFeaturePath.value_for_config_or(L"auto")).c_str()); - ini.SetValue("DLSS", "NVNGX_DLSS_Library", + ini.SetValue("DLSS", "NVNGX_DLSS_Path", wstring_to_string(Instance()->NVNGX_DLSS_Library.value_for_config_or(L"auto")).c_str()); ini.SetValue("DLSS", "RenderPresetOverride", GetBoolValue(Instance()->RenderPresetOverride.value_for_config()).c_str()); @@ -973,19 +973,23 @@ bool Config::SaveIni() // inputs { - ini.SetValue("Inputs", "Dlss", GetBoolValue(Instance()->EnableDlssInputs.value_for_config()).c_str()); - ini.SetValue("Inputs", "XeSS", GetBoolValue(Instance()->EnableXeSSInputs.value_for_config()).c_str()); - ini.SetValue("Inputs", "Fsr2", GetBoolValue(Instance()->UseFsr2Inputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "EnableDlssInputs", + GetBoolValue(Instance()->EnableDlssInputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "EnableXeSSInputs", + GetBoolValue(Instance()->EnableXeSSInputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "UseFsr2Inputs", GetBoolValue(Instance()->UseFsr2Inputs.value_for_config()).c_str()); ini.SetValue("Inputs", "Fsr2Pattern", GetBoolValue(Instance()->Fsr2Pattern.value_for_config()).c_str()); - ini.SetValue("Inputs", "Fsr3", GetBoolValue(Instance()->UseFsr3Inputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "UseFsr3Inputs", GetBoolValue(Instance()->UseFsr3Inputs.value_for_config()).c_str()); ini.SetValue("Inputs", "Fsr3Pattern", GetBoolValue(Instance()->Fsr3Pattern.value_for_config()).c_str()); - ini.SetValue("Inputs", "Ffx", GetBoolValue(Instance()->UseFfxInputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "UseFfxInputs", GetBoolValue(Instance()->UseFfxInputs.value_for_config()).c_str()); ini.SetValue("Inputs", "EnableHotSwapping", GetBoolValue(Instance()->EnableHotSwapping.value_for_config()).c_str()); - ini.SetValue("Inputs", "UseFsr2", GetBoolValue(Instance()->EnableFsr2Inputs.value_for_config()).c_str()); - ini.SetValue("Inputs", "UseFsr3", GetBoolValue(Instance()->EnableFsr3Inputs.value_for_config()).c_str()); - ini.SetValue("Inputs", "UseFfx", GetBoolValue(Instance()->EnableFfxInputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "EnableFsr2Inputs", + GetBoolValue(Instance()->EnableFsr2Inputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "EnableFsr3Inputs", + GetBoolValue(Instance()->EnableFsr3Inputs.value_for_config()).c_str()); + ini.SetValue("Inputs", "EnableFfxInputs", GetBoolValue(Instance()->EnableFfxInputs.value_for_config()).c_str()); } auto pathWStr = absoluteFileName.wstring();