Change GPU sync logic once again

OpenXR must first release the swapchain frame, then call xrEndFrame!
Detegr · Jan 8, 2024 · cf17f68 · cf17f68
1 parent 9df6a02
commit cf17f68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/OpenVR.cpp b/OpenVR.cpp
@@ -131,7 +131,7 @@ void OpenVR::SubmitFramesToHMD(IDirect3DDevice9* dev)
         dev->StretchRect(dxSurface[RightEye], nullptr, rightEye, nullptr, D3DTEXF_NONE);
     }
 
-    gD3DVR->WaitDeviceIdle(true);
+    gD3DVR->BeginVRSubmit();
 
     if (auto e = compositor->Submit(static_cast<vr::EVREye>(LeftEye), &openvrTexture[LeftEye]); e != vr::VRCompositorError_None) [[unlikely]] {
         Dbg(std::format("Compositor error: {}", VRCompositorErrorStr(e)));
@@ -140,6 +140,8 @@ void OpenVR::SubmitFramesToHMD(IDirect3DDevice9* dev)
         Dbg(std::format("Compositor error: {}", VRCompositorErrorStr(e)));
     }
 
+    gD3DVR->EndVRSubmit();
+
 release:
     leftEye->Release();
     rightEye->Release();

diff --git a/OpenXR.cpp b/OpenXR.cpp
@@ -430,9 +430,6 @@ void OpenXR::SubmitFramesToHMD(IDirect3DDevice9* dev)
         return;
     }
 
-    // Wait for the GPU. Without this the game will crash at startup.
-    gD3DVR->WaitDeviceIdle(true);
-
     // Essentially StretchRect but works directly with VkImage as a target
     gD3DVR->CopySurfaceToVulkanImage(
         dxSurface[LeftEye],
@@ -474,12 +471,16 @@ void OpenXR::SubmitFramesToHMD(IDirect3DDevice9* dev)
         .layers = layers,
     };
 
+    xrReleaseSwapchainImage(swapchains[LeftEye], &releaseInfo);
+    xrReleaseSwapchainImage(swapchains[RightEye], &releaseInfo);
+
+    gD3DVR->BeginVRSubmit();
+
     if (auto res = xrEndFrame(session, &frameEndInfo); res != XR_SUCCESS) {
         Dbg(std::format("xrEndFrame failed: {}", XrResultToString(instance, res)));
     }
 
-    xrReleaseSwapchainImage(swapchains[LeftEye], &releaseInfo);
-    xrReleaseSwapchainImage(swapchains[RightEye], &releaseInfo);
+    gD3DVR->EndVRSubmit();
 
     if (gCfg.debug && perfQueryFree) [[unlikely]] {
         gpuEndQuery->Issue(D3DISSUE_END);