Added FsrAgilitySDKUpgrade ini option

Author: cdozdil

OptiScaler.ini

@@ -283,14 +283,20 @@ Fsr4Update=auto
 
 ; Indicates input color resource contains perceptual sRGB colors
 ; Might improve IQ of FSR4
-; true or false - Default (auto) is true
+; true or false - Default (auto) is false
 FsrNonLinearSRGB=auto
 
 ; Indicates input color resource contains perceptual PQ colors
 ; Might improve IQ of FSR4
-; true or false - Default (auto) is true
+; true or false - Default (auto) is false
 FsrNonLinearPQ=auto
 
+; Updates the DirectX 12 Agility SDK
+; Enabling the use of FSR 4 on Windows 10 in older titles like Cyberpunk 2077
+; You MUST copy D3D12_Optiscaler folder next to games exe!
+; true or false - Default (auto) is false
+FsrAgilitySDKUpgrade=auto
+
 
 
 ; -------------------------------------------------------

OptiScaler/Config.cpp

@@ -119,6 +119,7 @@ bool Config::Reload(std::filesystem::path iniPath)
             Fsr4Update.set_from_config(readBool("FSR", "Fsr4Update"));
             FsrNonLinearPQ.set_from_config(readBool("FSR", "FsrNonLinearPQ"));
             FsrNonLinearSRGB.set_from_config(readBool("FSR", "FsrNonLinearSRGB"));
+            FsrAgilitySDKUpgrade.set_from_config(readBool("FSR", "FsrAgilitySDKUpgrade"));
 
             // Only sRGB or PQ should be enabled
             if (FsrNonLinearPQ.has_value() && FsrNonLinearPQ.value())
@@ -614,6 +615,7 @@ bool Config::SaveIni()
         ini.SetValue("FSR", "Fsr4Update", GetBoolValue(Instance()->Fsr4Update.value_for_config()).c_str());
         ini.SetValue("FSR", "FsrNonLinearPQ", GetBoolValue(Instance()->FsrNonLinearPQ.value_for_config()).c_str());
         ini.SetValue("FSR", "FsrNonLinearSRGB", GetBoolValue(Instance()->FsrNonLinearSRGB.value_for_config()).c_str());
+        ini.SetValue("FSR", "FsrAgilitySDKUpgrade", GetBoolValue(Instance()->FsrAgilitySDKUpgrade.value_for_config()).c_str());
     }
 
     // XeSS

OptiScaler/Config.h

@@ -258,6 +258,7 @@ class Config
 	CustomOptional<bool> Fsr4Update{ false };
 	CustomOptional<bool> FsrNonLinearSRGB{ false };
 	CustomOptional<bool> FsrNonLinearPQ{ false };
+	CustomOptional<bool> FsrAgilitySDKUpgrade{ false };
 
 	// FSR Common
 	CustomOptional<float> FsrVerticalFov{ 60.0f };

OptiScaler/dllmain.cpp

@@ -864,22 +864,25 @@ static FARPROC hkGetProcAddress(HMODULE hModule, LPCSTR lpProcName)
     }
 
     // For Agility SDK Upgrade
-	HMODULE mod_mainExe;
-	GetModuleHandleEx(2u, 0i64, &mod_mainExe);
-	if (hModule == mod_mainExe && lpProcName != nullptr)
-	{
-		if (strcmp(lpProcName, "D3D12SDKVersion") == 0)
-		{
-			LOG_INFO("D3D12SDKVersion call, returning this version!");
-			return (FARPROC)&customD3D12SDKVersion;
-		}
+    if (Config::Instance()->FsrAgilitySDKUpgrade.value_or_default())
+    {
+        HMODULE mod_mainExe;
+        GetModuleHandleEx(2u, 0i64, &mod_mainExe);
+        if (hModule == mod_mainExe && lpProcName != nullptr)
+        {
+            if (strcmp(lpProcName, "D3D12SDKVersion") == 0)
+            {
+                LOG_INFO("D3D12SDKVersion call, returning this version!");
+                return (FARPROC)&customD3D12SDKVersion;
+            }
 
-		if (strcmp(lpProcName, "D3D12SDKPath") == 0)
-		{
-			LOG_INFO("D3D12SDKPath call, returning this path!");
-			return (FARPROC)&customD3D12SDKPath;
-		}
-	}
+            if (strcmp(lpProcName, "D3D12SDKPath") == 0)
+            {
+                LOG_INFO("D3D12SDKPath call, returning this path!");
+                return (FARPROC)&customD3D12SDKPath;
+            }
+        }
+    }
 
     if (State::Instance().isRunningOnLinux && lpProcName != nullptr && hModule == GetModuleHandle(L"gdi32.dll") && lstrcmpA(lpProcName, "D3DKMTEnumAdapters2") == 0)
         return (FARPROC)&customD3DKMTEnumAdapters2;