Synchronize changes from 1.6 branch [ci skip]

9a6bac7 Fix recently introduced log spam
3390d22 Addendum to e556d42

Author: github-actions[bot]

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -73,6 +73,7 @@ void CDirect3DEvents9::OnBeginScene(IDirect3DDevice9* pDevice)
 
 bool CDirect3DEvents9::OnEndScene(IDirect3DDevice9* pDevice)
 {
+    CloseActiveShader();
     return true;
 }
 
@@ -94,22 +95,22 @@ void CDirect3DEvents9::OnInvalidate(IDirect3DDevice9* pDevice)
         g_pCore->GetGraphics()->GetRenderItemManager()->SaveReadableDepthBuffer();
         g_pCore->GetGraphics()->GetRenderItemManager()->FlushNonAARenderTarget();
 
+        // Ensure any in-progress effect passes are wrapped up before ending the scene
+        CloseActiveShader();
+
         if (g_bInMTAScene || g_bInGTAScene)
         {
             const HRESULT hrEndScene = pDevice->EndScene();
             if (FAILED(hrEndScene))
                 WriteDebugEvent(SString("OnInvalidate: EndScene failed: %08x", hrEndScene));
         }
-
-        CloseActiveShader();
     }
     else
     {
+        CloseActiveShader(false);
+
         if (g_bInMTAScene || g_bInGTAScene)
             WriteDebugEvent("OnInvalidate: device lost, skipping EndScene and pending GPU work");
-
-        // Prevent reuse of partially configured shader state across device resets without touching the lost device
-        CloseActiveShader(false);
     }
 
     g_bInMTAScene = false;
@@ -219,6 +220,9 @@ void CDirect3DEvents9::OnPresent(IDirect3DDevice9* pDevice)
 
     CGraphics::GetSingleton().LeavingMTARenderZone();
 
+    // Finalize any lingering shader passes before wrapping the scene
+    CloseActiveShader();
+
     // End the scene that we started.
     if (g_bInMTAScene)
     {

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -584,8 +584,6 @@ VOID CProxyDirect3DDevice9::SetGammaRamp(UINT iSwapChain, DWORD Flags, CONST D3D
 
         // Set the adjusted gamma ramp
         m_pDevice->SetGammaRamp(iSwapChain, Flags, &adjustedRamp);
-        
-        WriteDebugEvent("Applied gamma adjustment for borderless windowed mode");
     }
     else
     {

Client/core/Graphics/CGraphics.cpp

@@ -2005,7 +2005,6 @@ void CGraphics::SaveGTARenderStates()
     // Prevent GPU driver hang by checking device state before creating state blocks
     if (m_pDevice->TestCooperativeLevel() != D3D_OK)
     {
-        WriteDebugEvent("CGraphics::SaveGTARenderStates - Device not cooperative, skipping state block creation");
         return;
     }
 
@@ -2041,7 +2040,6 @@ void CGraphics::RestoreGTARenderStates()
     // Check device state before attempting to restore
     if (m_pDevice->TestCooperativeLevel() != D3D_OK)
     {
-        WriteDebugEvent("CGraphics::RestoreGTARenderStates - Device not cooperative, skipping state restoration");
         SAFE_RELEASE(m_pSavedStateBlock);
         return;
     }