From ebd830f7a75be01a08183b7df54c2c48ee37bc9e Mon Sep 17 00:00:00 2001
From: cdozdil <cdozdil@gmail.com>
Date: Tue, 22 Apr 2025 18:33:54 +0300
Subject: [PATCH] Added more detailed logging to FSR4Upgrade

---
 OptiScaler/FSR4Upgrade.h | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/OptiScaler/FSR4Upgrade.h b/OptiScaler/FSR4Upgrade.h
index 9298baf8..bb685e11 100644
--- a/OptiScaler/FSR4Upgrade.h
+++ b/OptiScaler/FSR4Upgrade.h
@@ -155,15 +155,14 @@ typedef HRESULT(STDMETHODCALLTYPE* PFN_UpdateFfxApiProvider)(void* pData, uint32
 
 struct AmdExtFfxApi : public IAmdExtFfxApi
 {
-    PFN_UpdateFfxApiProvider pfnUpdateFfxApiProvider = nullptr;
+    PFN_UpdateFfxApiProvider o_UpdateFfxApiProvider = nullptr;
 
     HRESULT STDMETHODCALLTYPE UpdateFfxApiProvider(void* pData, uint32_t dataSizeInBytes) override
     {
         LOG_INFO("UpdateFfxApiProvider called");
 
-        if (pfnUpdateFfxApiProvider == nullptr)
+        if (o_UpdateFfxApiProvider == nullptr)
         {
-            LOG_DEBUG("Trying to load from local folder");
             auto fsr4Module = KernelBaseProxy::LoadLibraryExW_()(L"amdxcffx64.dll", NULL, 0);
 
             if (fsr4Module == nullptr)
@@ -177,9 +176,19 @@ struct AmdExtFfxApi : public IAmdExtFfxApi
                         auto dllPath = storePath[i] / L"amdxcffx64.dll";
                         LOG_DEBUG("Trying to load: {}", wstring_to_string(dllPath.c_str()));
                         fsr4Module = KernelBaseProxy::LoadLibraryExW_()(dllPath.c_str(), NULL, 0);
+
+                        if (fsr4Module != nullptr)
+                        {
+                            LOG_INFO("amdxcffx64 loaded from {}", dllPath.string());
+                            break;
+                        }
                     }
                 }
             }
+            else
+            {
+                LOG_INFO("amdxcffx64 loaded from game folder");
+            }
 
             if (fsr4Module == nullptr)
             {
@@ -187,19 +196,20 @@ struct AmdExtFfxApi : public IAmdExtFfxApi
                 return E_NOINTERFACE;
             }
 
-            pfnUpdateFfxApiProvider = (PFN_UpdateFfxApiProvider)KernelBaseProxy::GetProcAddress_()(fsr4Module, "UpdateFfxApiProvider");
+            o_UpdateFfxApiProvider = (PFN_UpdateFfxApiProvider)KernelBaseProxy::GetProcAddress_()(fsr4Module, "UpdateFfxApiProvider");
 
-            if (pfnUpdateFfxApiProvider == nullptr)
+            if (o_UpdateFfxApiProvider == nullptr)
             {
                 LOG_ERROR("Failed to get UpdateFfxApiProvider");
                 return E_NOINTERFACE;
             }
         }
 
-        if (pfnUpdateFfxApiProvider != nullptr)
+        if (o_UpdateFfxApiProvider != nullptr)
         {
             State::DisableChecks(1);
-            auto result = pfnUpdateFfxApiProvider(pData, dataSizeInBytes);
+            auto result = o_UpdateFfxApiProvider(pData, dataSizeInBytes);
+            LOG_INFO("UpdateFfxApiProvider called, result: {} ({:X})", result == S_OK ? "Ok" : "Error", (UINT)result);
             State::EnableChecks(1);
             return result;
         }
@@ -310,6 +320,8 @@ inline static HRESULT STDMETHODCALLTYPE hkAmdExtD3DCreateInterface(IUnknown* pOu
         // Return custom one
         *ppvObject = _amdExtFfxApi;
 
+        LOG_INFO("IAmdExtFfxApi queried, returning custom AmdExtFfxApi");
+
         return S_OK;
     }
 
@@ -336,7 +348,7 @@ inline void InitFSR4Update()
 
     if (moduleAmdxc64 != nullptr)
     {
-        LOG_DEBUG("Found amdxc64.dll");
+        LOG_INFO("amdxc64.dll loaded");
         o_AmdExtD3DCreateInterface = (PFN_AmdExtD3DCreateInterface)KernelBaseProxy::GetProcAddress_()(moduleAmdxc64, "AmdExtD3DCreateInterface");
 
         if (o_AmdExtD3DCreateInterface != nullptr)
@@ -348,4 +360,8 @@ inline void InitFSR4Update()
             DetourTransactionCommit();
         }
     }
+    else
+    {
+        LOG_INFO("Failed to load amdxc64.dll");
+    }
 }
\ No newline at end of file