diff --git a/OptiScaler/Config.cpp b/OptiScaler/Config.cpp index e2d22765..b7c95696 100644 --- a/OptiScaler/Config.cpp +++ b/OptiScaler/Config.cpp @@ -68,7 +68,7 @@ bool Config::Reload(std::filesystem::path iniPath) auto xessLibraryPathA = readString("XeSS", "LibraryPath"); - if(xessLibraryPathA.has_value()) + if (xessLibraryPathA.has_value()) XeSSLibrary = string_to_wstring(xessLibraryPathA.value()); } @@ -260,7 +260,7 @@ bool Config::Reload(std::filesystem::path iniPath) // Hotfixes { RoundInternalResolution = readInt("Hotfix", "RoundInternalResolution"); - + MipmapBiasOverride = readFloat("Hotfix", "MipmapBiasOverride"); if (MipmapBiasOverride.has_value() && (MipmapBiasOverride.value() > 15.0 || MipmapBiasOverride.value() < -15.0)) MipmapBiasOverride.reset(); @@ -272,7 +272,7 @@ bool Config::Reload(std::filesystem::path iniPath) RestoreComputeSignature = readBool("Hotfix", "RestoreComputeSignature"); RestoreComputeSignature = readBool("Hotfix", "RestoreComputeSignature"); SkipFirstFrames = readInt("Hotfix", "SkipFirstFrames"); - + UsePrecompiledShaders = readBool("Hotfix", "UsePrecompiledShaders"); ColorResourceBarrier = readInt("Hotfix", "ColorResourceBarrier"); @@ -332,7 +332,7 @@ bool Config::Reload(std::filesystem::path iniPath) DE_Generator = readString("FrameGeneration", "Generator", true); - if (DE_Generator.has_value() && DE_Generator.value() != "fsr3" && DE_Generator.value() != "dlssg") + if (DE_Generator.has_value() && DE_Generator.value() != "fsr30" && DE_Generator.value() != "fsr31" && DE_Generator.value() != "dlssg") DE_Generator.reset(); buffer = readString("FrameGeneration", "FramerateLimit", true); @@ -554,7 +554,7 @@ bool Config::SaveIni() ini.SetValue("Hotfix", "RestoreComputeSignature", GetBoolValue(Instance()->RestoreComputeSignature).c_str()); ini.SetValue("Hotfix", "RestoreGraphicSignature", GetBoolValue(Instance()->RestoreGraphicSignature).c_str()); ini.SetValue("Hotfix", "SkipFirstFrames", GetIntValue(Instance()->SkipFirstFrames).c_str()); - + ini.SetValue("Hotfix", "UsePrecompiledShaders", GetBoolValue(Instance()->UsePrecompiledShaders).c_str()); ini.SetValue("Hotfix", "ColorResourceBarrier", GetIntValue(Instance()->ColorResourceBarrier).c_str()); diff --git a/OptiScaler/Config.h b/OptiScaler/Config.h index 5fb6e42e..2f04c332 100644 --- a/OptiScaler/Config.h +++ b/OptiScaler/Config.h @@ -171,7 +171,7 @@ public: std::optional DE_FramerateLimitVsync; std::optional DE_DynamicLimitAvailable; // DFG.Available std::optional DE_DynamicLimitEnabled; // DFG.Enabled - std::optional DE_Generator; // auto - fsr3 - dlssg + std::optional DE_Generator; // auto - fsr30 - fsr31 - dlssg std::optional DE_Reflex; // on - boost - off std::optional DE_ReflexEmu; // auto - on - off diff --git a/OptiScaler/imgui/imgui_common.cpp b/OptiScaler/imgui/imgui_common.cpp index 81b2d2a2..1e459733 100644 --- a/OptiScaler/imgui/imgui_common.cpp +++ b/OptiScaler/imgui/imgui_common.cpp @@ -1199,8 +1199,10 @@ void ImGuiCommon::RenderMenu() if (Config::Instance()->DE_Generator.value_or("auto") == "auto") selected = "Auto"; - else if (Config::Instance()->DE_Generator.value_or("auto") == "fsr3") - selected = "FSR3"; + else if (Config::Instance()->DE_Generator.value_or("auto") == "fsr30") + selected = "FSR3.0"; + else if (Config::Instance()->DE_Generator.value_or("auto") == "fsr31") + selected = "FSR3.1"; else if (Config::Instance()->DE_Generator.value_or("auto") == "dlssg") selected = "DLSS-G"; @@ -1209,8 +1211,11 @@ void ImGuiCommon::RenderMenu() if (ImGui::Selectable("Auto", Config::Instance()->DE_Generator.value_or("auto") == "auto")) Config::Instance()->DE_Generator = "auto"; - if (ImGui::Selectable("FSR3", Config::Instance()->DE_Generator.value_or("auto") == "fsr3")) - Config::Instance()->DE_Generator = "fsr3"; + if (ImGui::Selectable("FSR3.0", Config::Instance()->DE_Generator.value_or("auto") == "fsr30")) + Config::Instance()->DE_Generator = "fsr30"; + + if (ImGui::Selectable("FSR3.1", Config::Instance()->DE_Generator.value_or("auto") == "fsr31")) + Config::Instance()->DE_Generator = "fsr31"; if (ImGui::Selectable("DLSS-G", Config::Instance()->DE_Generator.value_or("auto") == "dlssg")) Config::Instance()->DE_Generator = "dlssg";