[d3d8] EndScene on Reset

AlpyneDreams · AlpyneDreams · commit f974535b7058 · 2023-03-04T01:17:13.000-08:00
Should fix #111
diff --git a/src/d3d8/d3d8_device.h b/src/d3d8/d3d8_device.h
@@ -817,6 +817,8 @@ namespace dxvk {
     inline bool ShouldRecord() { return m_recorder != nullptr; }
 
     inline void ResetState() {
+      // Resetting implicitly ends scenes started by BeginScene
+      m_bridge->ForceEndScene();
       // Purge cached objects
       // TODO: Some functions may need to be called here (e.g. SetTexture, etc.)
       // in case Reset can be recorded by state blocks and other things.
diff --git a/src/d3d9/d3d9_bridge.cpp b/src/d3d9/d3d9_bridge.cpp
@@ -24,6 +24,10 @@ namespace dxvk {
     m_device->m_dxsoOptions.shadowFilter = enabled;
   }
 
+  void D3D9Bridge::ForceEndScene() {
+    m_device->m_flags.clr(D3D9DeviceFlag::InScene);
+  }
+
   HRESULT D3D9Bridge::UpdateTextureFromBuffer(
         IDirect3DSurface9*  pDestSurface,
         IDirect3DSurface9*  pSrcSurface,
diff --git a/src/d3d9/d3d9_bridge.h b/src/d3d9/d3d9_bridge.h
@@ -46,6 +46,8 @@ namespace dxvk {
 
     virtual void SetShadowBuffersEnabled(bool enabled);
 
+    virtual void ForceEndScene();
+
     virtual HRESULT UpdateTextureFromBuffer(
         IDirect3DSurface9*        pDestSurface,
         IDirect3DSurface9*        pSrcSurface,
