From 91c6793b559becd442b86ca4d5be07b67745cf5b Mon Sep 17 00:00:00 2001
From: netborg <137700136+netborg-afps@users.noreply.github.com>
Date: Fri, 28 Feb 2025 08:37:11 +0100
Subject: [PATCH] [dxvk] Disallow flush for beginLatencyTracking's emitCs

Not sure if this does anything, but better be safe to correctly track when the first succeeding Cs will get executed.
---
 src/d3d11/d3d11_context.h     | 5 +++--
 src/d3d11/d3d11_swapchain.cpp | 2 +-
 src/d3d9/d3d9_device.cpp      | 2 +-
 src/d3d9/d3d9_device.h        | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/d3d11/d3d11_context.h b/src/d3d11/d3d11_context.h
index a2d6c3659..76b4d7811 100644
--- a/src/d3d11/d3d11_context.h
+++ b/src/d3d11/d3d11_context.h
@@ -1084,7 +1084,7 @@ namespace dxvk {
             UINT                              SampleMask);
 
     template<bool AllowFlush = !IsDeferred, typename Cmd>
-    void EmitCs(Cmd&& command) {
+    void EmitCs(Cmd&& command, bool disableFlush=false ) {
       m_cmdData = nullptr;
 
       if (unlikely(!m_csChunk->push(command))) {
@@ -1092,7 +1092,8 @@ namespace dxvk {
         m_csChunk = AllocCsChunk();
 
         if constexpr (AllowFlush)
-          GetTypedContext()->ConsiderFlush(GpuFlushType::ImplicitWeakHint);
+          if (!disableFlush)
+            GetTypedContext()->ConsiderFlush(GpuFlushType::ImplicitWeakHint);
 
         m_csChunk->push(command);
       }
diff --git a/src/d3d11/d3d11_swapchain.cpp b/src/d3d11/d3d11_swapchain.cpp
index e2100eb8d..3eb636309 100644
--- a/src/d3d11/d3d11_swapchain.cpp
+++ b/src/d3d11/d3d11_swapchain.cpp
@@ -472,7 +472,7 @@ namespace dxvk {
           cFrameId = m_frameId
         ] (DxvkContext* ctx) {
           ctx->beginLatencyTracking(cLatency, cFrameId + 1u);
-        });
+        }, true);
       }
     }
 
diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
index f704723db..8d4b86826 100644
--- a/src/d3d9/d3d9_device.cpp
+++ b/src/d3d9/d3d9_device.cpp
@@ -6129,7 +6129,7 @@ namespace dxvk {
     ] (DxvkContext* ctx) {
       if (cTracker && cTracker->needsAutoMarkers())
         ctx->beginLatencyTracking(cTracker, cFrameId);
-    });
+    }, true);
   }
 
 
diff --git a/src/d3d9/d3d9_device.h b/src/d3d9/d3d9_device.h
index 3a2a4184d..88a60a4b7 100644
--- a/src/d3d9/d3d9_device.h
+++ b/src/d3d9/d3d9_device.h
@@ -1180,13 +1180,14 @@ namespace dxvk {
   private:
 
     template<bool AllowFlush = true, typename Cmd>
-    void EmitCs(Cmd&& command) {
+    void EmitCs(Cmd&& command, bool disableFlush=false) {
       if (unlikely(!m_csChunk->push(command))) {
         EmitCsChunk(std::move(m_csChunk));
         m_csChunk = AllocCsChunk();
 
         if constexpr (AllowFlush)
-          ConsiderFlush(GpuFlushType::ImplicitWeakHint);
+          if (!disableFlush)
+            ConsiderFlush(GpuFlushType::ImplicitWeakHint);
 
         m_csChunk->push(command);
       }