added fsr3 pattern matching for rdr1

cdozdil · Jan 29, 2025 · 9a30fe7 · 9a30fe7
1 parent 697fa95
commit 9a30fe7
Show file tree

Hide file tree

Showing 8 changed files with 286 additions and 12 deletions.
diff --git a/OptiScaler/Config.cpp b/OptiScaler/Config.cpp
@@ -336,6 +336,7 @@ bool Config::Reload(std::filesystem::path iniPath)
             Fsr2Inputs.set_from_config(readBool("Inputs", "Fsr2"));
             Fsr2Pattern.set_from_config(readBool("Inputs", "Fsr2Pattern"));
             Fsr3Inputs.set_from_config(readBool("Inputs", "Fsr3"));
+            Fsr3Pattern.set_from_config(readBool("Inputs", "Fsr3Pattern"));
             FfxInputs.set_from_config(readBool("Inputs", "Ffx"));
         }
 
@@ -726,6 +727,7 @@ bool Config::SaveIni()
         ini.SetValue("Inputs", "Fsr2", GetBoolValue(Instance()->Fsr2Inputs.value_for_config()).c_str());
         ini.SetValue("Inputs", "Fsr2Pattern", GetBoolValue(Instance()->Fsr2Pattern.value_for_config()).c_str());
         ini.SetValue("Inputs", "Fsr3", GetBoolValue(Instance()->Fsr3Inputs.value_for_config()).c_str());
+        ini.SetValue("Inputs", "Fsr3Pattern", GetBoolValue(Instance()->Fsr3Pattern.value_for_config()).c_str());
         ini.SetValue("Inputs", "Ffx", GetBoolValue(Instance()->FfxInputs.value_for_config()).c_str());
     }
 

diff --git a/OptiScaler/Config.h b/OptiScaler/Config.h
@@ -330,6 +330,7 @@ class Config
 	CustomOptional<bool> Fsr2Inputs{ true };
 	CustomOptional<bool> Fsr2Pattern{ false };
 	CustomOptional<bool> Fsr3Inputs{ true };
+	CustomOptional<bool> Fsr3Pattern{ false };
 	CustomOptional<bool> FfxInputs{ true };
 
 	// Framerate

diff --git a/OptiScaler/inputs/FSR2_Dx12.cpp b/OptiScaler/inputs/FSR2_Dx12.cpp
@@ -977,10 +977,10 @@ void HookFSR2ExeInputs()
     // Pattern matching
     if (Config::Instance()->Fsr2Pattern.value_or_default())
     {
-        LOG_DEBUG("Checking createPattern");
         std::wstring_view exeNameV(exeNameW.c_str());
 
         // Create
+        LOG_DEBUG("Checking createPattern");
         std::string_view createPattern("40 55 57 41 54 41 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 85 ? ? ? ? 4C 8B F2 41 B8 ? ? ? ? 33 D2 48 8B F9 E8");
         o_ffxFsr2ContextCreate_Pattern_Dx12 = (PFN_ffxFsr2ContextCreate)scanner::GetAddress(exeNameV, createPattern, 0);
 

diff --git a/OptiScaler/inputs/FSR3_Dx12.cpp b/OptiScaler/inputs/FSR3_Dx12.cpp
diff --git a/OptiScaler/menu/menu_common.cpp b/OptiScaler/menu/menu_common.cpp
@@ -2593,19 +2593,23 @@ bool MenuCommon::RenderMenu()
                     bool fsr2Inputs = Config::Instance()->Fsr2Inputs.value_or_default();
                     bool fsr2Pattern = Config::Instance()->Fsr2Pattern.value_or_default();
                     bool fsr3Inputs = Config::Instance()->Fsr3Inputs.value_or_default();
+                    bool fsr3Pattern = Config::Instance()->Fsr3Pattern.value_or_default();
                     bool ffxInputs = Config::Instance()->FfxInputs.value_or_default();
 
                     if (ImGui::Checkbox("Use Fsr2 Inputs", &fsr2Inputs))
                         Config::Instance()->Fsr2Inputs = fsr2Inputs;
 
                     if (ImGui::Checkbox("Use Fsr2 Pattern Matching", &fsr2Pattern))
                         Config::Instance()->Fsr2Pattern = fsr2Pattern;
-
                     ShowTooltip("This setting will become active on next boot!");
 
                     if (ImGui::Checkbox("Use Fsr3 Inputs", &fsr3Inputs))
                         Config::Instance()->Fsr3Inputs = fsr3Inputs;
 
+                    if (ImGui::Checkbox("Use Fsr3 Pattern Matching", &fsr3Pattern))
+                        Config::Instance()->Fsr3Pattern = fsr2Pattern;
+                    ShowTooltip("This setting will become active on next boot!");
+
                     if (ImGui::Checkbox("Use Ffx Inputs", &ffxInputs))
                         Config::Instance()->FfxInputs = ffxInputs;
                 }

diff --git a/OptiScaler/scanner/scanner.cpp b/OptiScaler/scanner/scanner.cpp
@@ -46,9 +46,14 @@ uintptr_t FindPattern(uintptr_t startAddress, uintptr_t maxSize, const char* mas
 	return std::distance(dataStart, sig) + startAddress;
 }
 
-uintptr_t scanner::GetAddress(const std::wstring_view moduleName, const std::string_view pattern, ptrdiff_t offset)
+uintptr_t scanner::GetAddress(const std::wstring_view moduleName, const std::string_view pattern, ptrdiff_t offset, uintptr_t startAddress)
 {
-	uintptr_t address = FindPattern(GetModule(moduleName.data()).first, GetModule(moduleName.data()).second - GetModule(moduleName.data()).first, pattern.data());
+	uintptr_t address;
+
+    if (startAddress != 0)
+        address = FindPattern(startAddress, GetModule(moduleName.data()).second - GetModule(moduleName.data()).first, pattern.data());
+    else
+        address = FindPattern(GetModule(moduleName.data()).first, GetModule(moduleName.data()).second - GetModule(moduleName.data()).first, pattern.data());
 
 	if ((GetModuleHandleW(moduleName.data()) != nullptr) && (address != NULL))
 	{

diff --git a/OptiScaler/scanner/scanner.h b/OptiScaler/scanner/scanner.h
@@ -5,6 +5,6 @@
 
 namespace scanner
 {
-	uintptr_t GetAddress(const std::wstring_view moduleName, const std::string_view pattern, ptrdiff_t offset = 0);
+	uintptr_t GetAddress(const std::wstring_view moduleName, const std::string_view pattern, ptrdiff_t offset = 0, uintptr_t startAddress = 0);
 	uintptr_t GetOffsetFromInstruction(const std::wstring_view moduleName, const std::string_view pattern, ptrdiff_t offset = 0);
 }
diff --git a/nvngx.ini b/nvngx.ini
@@ -130,6 +130,11 @@ Fsr2Pattern=auto
 ; true or false - Default (auto) is true
 Fsr3=auto
 
+; Try to find FSR3 methods with pattern matching
+; Will slow down the loading of game
+; true or false - Default (auto) is false
+Fsr3Pattern=auto
+
 ; Optiscaler will hook (amd_fidelityfx_dx12.dll) and use FidelityFX Api Inputs
 ; true or false - Default (auto) is true
 Ffx=auto