Synchronize changes from 1.6 branch [ci skip]

4343e49 D3D fix-ups after refactors #1

Author: github-actions[bot]

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -16,6 +16,7 @@
 #include "CProxyDirect3DVertexBuffer.h"
 #include "CProxyDirect3DIndexBuffer.h"
 #include "CProxyDirect3DTexture.h"
+#include "CProxyDirect3DDevice9.h"
 #include "CAdditionalVertexStreamManager.h"
 #include "CVertexStreamBoundingBoxManager.h"
 #include "CProxyDirect3DVertexDeclaration.h"
@@ -173,9 +174,9 @@ void CDirect3DEvents9::OnInvalidate(IDirect3DDevice9* pDevice)
 
         if (bInAnyScene)
         {
-            const HRESULT hrEndScene = pDevice->EndScene();
-            if (FAILED(hrEndScene))
-                WriteDebugEvent(SString("OnInvalidate: EndScene failed: %08x", hrEndScene));
+            const ESceneOwner owner = bInMTAScene ? ESceneOwner::MTA : (bInGTAScene ? ESceneOwner::GTA : ESceneOwner::None);
+            if (owner != ESceneOwner::None && !EndSceneWithoutProxy(pDevice, owner))
+                WriteDebugEvent("OnInvalidate: EndSceneWithoutProxy failed");
         }
     }
     else
@@ -222,16 +223,12 @@ void CDirect3DEvents9::OnPresent(IDirect3DDevice9* pDevice)
     // Start a new scene. This isn't ideal and is not really recommended by MSDN.
     // I tried disabling EndScene from GTA and just end it after this code ourselves
     // before present, but that caused graphical issues randomly with the sky.
-    const HRESULT hrBeginScene = pDevice->BeginScene();
-    if (FAILED(hrBeginScene))
+    if (!BeginSceneWithoutProxy(pDevice, ESceneOwner::MTA))
     {
-        WriteDebugEvent(SString("OnPresent: BeginScene failed: %08x", hrBeginScene));
-    g_bInMTAScene.store(false, std::memory_order_release);
+        WriteDebugEvent("OnPresent: BeginSceneWithoutProxy failed");
         return;
     }
 
-    g_bInMTAScene.store(true, std::memory_order_release);
-
     // Reset samplers on first call
     static bool bDoneReset = false;
     if (!bDoneReset)
@@ -301,8 +298,8 @@ void CDirect3DEvents9::OnPresent(IDirect3DDevice9* pDevice)
     // End the scene that we started.
     if (g_bInMTAScene.load(std::memory_order_acquire))
     {
-        pDevice->EndScene();
-    g_bInMTAScene.store(false, std::memory_order_release);
+        if (!EndSceneWithoutProxy(pDevice, ESceneOwner::MTA))
+            WriteDebugEvent("OnPresent: EndSceneWithoutProxy failed");
     }
 
     // Update incase settings changed

Client/core/Graphics/CGraphics.cpp

@@ -2144,12 +2144,49 @@ void CGraphics::DrawProgressMessage(bool bPreserveBackbuffer)
     if (m_LastLostDeviceTimer.Get() < 1000)
         return;
 
-    const bool bWasInScene = g_bInGTAScene.load(std::memory_order_acquire) ||
-                             g_bInMTAScene.load(std::memory_order_acquire);
-    bool       bInScene = bWasInScene;
+    const auto determineOwner = []() -> ESceneOwner {
+        if (g_bInMTAScene.load(std::memory_order_acquire))
+            return ESceneOwner::MTA;
+        if (g_bInGTAScene.load(std::memory_order_acquire))
+            return ESceneOwner::GTA;
+        return ESceneOwner::None;
+    };
+
+    const ESceneOwner originalOwner = determineOwner();
+    ESceneOwner       currentOwner = originalOwner;
+
+    auto inScene = [&]() { return currentOwner != ESceneOwner::None; };
+
+    auto endCurrentScene = [&](const char* context) -> bool {
+        if (!inScene())
+            return true;
+        if (!EndSceneWithoutProxy(m_pDevice, currentOwner))
+        {
+            SString msg;
+            msg.Format("%s: EndSceneWithoutProxy failed for owner %d", context, static_cast<int>(currentOwner));
+            WriteDebugEvent(msg);
+            return false;
+        }
+        currentOwner = ESceneOwner::None;
+        return true;
+    };
 
-    // Skip of not in a scene and not forced with always flag
-    if (!bInScene && !g_pCore->GetDummyProgressUpdateAlways())
+    auto beginSceneAs = [&](ESceneOwner owner, const char* context) -> bool {
+        if (owner == ESceneOwner::None)
+            return true;
+        if (!BeginSceneWithoutProxy(m_pDevice, owner))
+        {
+            SString msg;
+            msg.Format("%s: BeginSceneWithoutProxy failed for owner %d", context, static_cast<int>(owner));
+            WriteDebugEvent(msg);
+            return false;
+        }
+        currentOwner = owner;
+        return true;
+    };
+
+    // Skip if not in a scene and not forced with always flag
+    if (!inScene() && !g_pCore->GetDummyProgressUpdateAlways())
         return;
 
     // Check if disabled
@@ -2177,10 +2214,10 @@ void CGraphics::DrawProgressMessage(bool bPreserveBackbuffer)
     {
         if (bPreserveBackbuffer)
         {
-            if (bInScene)
+            if (inScene())
             {
-                m_pDevice->EndScene();
-                bInScene = false;
+                if (!endCurrentScene("CGraphics::DrawProgressMessage (preserve setup)"))
+                    break;
             }
 
             // Get backbuffer surface
@@ -2237,10 +2274,10 @@ void CGraphics::DrawProgressMessage(bool bPreserveBackbuffer)
                 break;
         }
 
-        if (!bInScene)
+        if (!inScene())
         {
-            m_pDevice->BeginScene();
-            bInScene = true;
+            if (!beginSceneAs(ESceneOwner::MTA, "CGraphics::DrawProgressMessage (draw setup)"))
+                break;
         }
 
         // Draw progress graphics on backbuffer surface
@@ -2281,8 +2318,11 @@ void CGraphics::DrawProgressMessage(bool bPreserveBackbuffer)
 
         if (bPreserveBackbuffer)
         {
-            m_pDevice->EndScene();
-            bInScene = false;
+            if (inScene())
+            {
+                if (!endCurrentScene("CGraphics::DrawProgressMessage (pre-present)"))
+                    break;
+            }
 
             // Flip backbuffer onto front buffer
             SAFE_RELEASE(pD3DBackBufferSurface);
@@ -2296,23 +2336,24 @@ void CGraphics::DrawProgressMessage(bool bPreserveBackbuffer)
                 break;
             hr = m_pDevice->StretchRect(m_pTempBackBufferData->m_pD3DRenderTargetSurface, NULL, pD3DBackBufferSurface, NULL, D3DTEXF_POINT);
 
-            m_pDevice->BeginScene();
-            bInScene = true;
+            if (!beginSceneAs(ESceneOwner::MTA, "CGraphics::DrawProgressMessage (post-present)"))
+                break;
         }
     } while (false);
 
     // Tidy
     SAFE_RELEASE(pTempFrontBufferData);
     SAFE_RELEASE(pD3DBackBufferSurface);
 
-    // Ensure scene status is restored
-    if (bInScene != bWasInScene)
+    // Ensure scene status is restored to its original owner
+    if (currentOwner != originalOwner)
     {
-        if (bWasInScene)
-            m_pDevice->BeginScene();
-        else
-            m_pDevice->EndScene();
-        bInScene = bWasInScene;
+        bool restorePossible = true;
+        if (currentOwner != ESceneOwner::None)
+            restorePossible = endCurrentScene("CGraphics::DrawProgressMessage (restore current)");
+
+        if (restorePossible && originalOwner != ESceneOwner::None && currentOwner != originalOwner)
+            beginSceneAs(originalOwner, "CGraphics::DrawProgressMessage (restore original)");
     }
 
     //