Fix FSR 4 on Lunyx again

Author: FakeMichau

OptiScaler/fsr4/FSR4Upgrade.h

@@ -458,43 +458,23 @@ inline static HRESULT STDMETHODCALLTYPE hkAmdExtD3DCreateInterface(IUnknown* pOu
 {
     CheckForGPU();
 
-    if (!Config::Instance()->Fsr4Update.value_or_default())
+    if (!Config::Instance()->Fsr4Update.value_or_default() && o_AmdExtD3DCreateInterface != nullptr)
         return o_AmdExtD3DCreateInterface(pOuter, riid, ppvObject);
 
-    // If querying IAmdExtFfxApi
-    if (riid == __uuidof(IAmdExtFfxApi))
-    {
-        if (_amdExtFfxApi == nullptr)
-            _amdExtFfxApi = new AmdExtFfxApi();
-
-        // Return custom one
-        *ppvObject = _amdExtFfxApi;
-
-        LOG_INFO("IAmdExtFfxApi queried, returning custom AmdExtFfxApi");
-
-        return S_OK;
-    }
-
-    if (o_AmdExtD3DCreateInterface != nullptr)
-        return o_AmdExtD3DCreateInterface(pOuter, riid, ppvObject);
-
-    return E_NOINTERFACE;
-}
-
-inline static HRESULT STDMETHODCALLTYPE customAmdExtD3DCreateInterface(IUnknown* pOuter, REFIID riid, void** ppvObject)
-{
-    if (riid == __uuidof(IAmdExtFfxFirst))
+    // Proton bleeding edge ships amdxc64 that is missing some required functions
+    else if (riid == __uuidof(IAmdExtFfxFirst) && State::Instance().isRunningOnLinux)
     {
         // Required for the custom AmdExtFfxApi, lack of it triggers visual glitches
         if (_amdExtFfxFirst == nullptr)
             _amdExtFfxFirst = new AmdExtFfxFirst();
 
         *ppvObject = _amdExtFfxFirst;
 
-        LOG_INFO("Custom IAmdExtFfxFirst queried, returning custom AmdExtFfxFirst");
+        LOG_INFO("IAmdExtFfxFirst queried, returning custom AmdExtFfxFirst");
 
         return S_OK;
     }
+
     else if (riid == __uuidof(IAmdExtFfxApi))
     {
         if (_amdExtFfxApi == nullptr)
@@ -503,11 +483,14 @@ inline static HRESULT STDMETHODCALLTYPE customAmdExtD3DCreateInterface(IUnknown*
         // Return custom one
         *ppvObject = _amdExtFfxApi;
 
-        LOG_INFO("Custom IAmdExtFfxApi queried, returning custom AmdExtFfxApi");
+        LOG_INFO("IAmdExtFfxApi queried, returning custom AmdExtFfxApi");
 
         return S_OK;
     }
 
+    else if (o_AmdExtD3DCreateInterface != nullptr)
+        return o_AmdExtD3DCreateInterface(pOuter, riid, ppvObject);
+
     return E_NOINTERFACE;
 }
 

OptiScaler/hooks/Kernel_Hooks.h

@@ -1748,7 +1748,7 @@ class KernelHooks
         if (lpProcName != nullptr && (hModule == amdxc64Mark || hModule == nullptr) &&
             lstrcmpA(lpProcName, "AmdExtD3DCreateInterface") == 0 && Config::Instance()->Fsr4Update.value_for_config())
         {
-            return (FARPROC) &customAmdExtD3DCreateInterface;
+            return (FARPROC) &hkAmdExtD3DCreateInterface;
         }
 
         if (State::Instance().isRunningOnLinux && lpProcName != nullptr &&