From 685cf83c87551ea566b1002e54d0a4b774c97df8 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 7 Aug 2026 20:37:15 +1000
Subject: [PATCH] D3D12Device: Order dependent compute UAV accesses

Insert UAV barriers for image render targets before each compute dispatch.
---
 src/util/d3d12_device.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/util/d3d12_device.cpp b/src/util/d3d12_device.cpp
index a7d8ebc33..14d2b9604 100644
--- a/src/util/d3d12_device.cpp
+++ b/src/util/d3d12_device.cpp
@@ -1891,8 +1891,7 @@ void D3D12Device::BeginRenderPass()
           case GPUTexture::State::Cleared:
           {
             desc.BeginningAccess.Type = D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_CLEAR;
-            desc.BeginningAccess.Clear.ClearValue.Format =
-              D3DCommon::GetFormatMapping(rt->GetFormat()).rtv_format;
+            desc.BeginningAccess.Clear.ClearValue.Format = D3DCommon::GetFormatMapping(rt->GetFormat()).rtv_format;
             std::memcpy(desc.BeginningAccess.Clear.ClearValue.Color, rt->GetUNormClearColor().data(),
                         sizeof(desc.BeginningAccess.Clear.ClearValue.Color));
             rt->SetState(GPUTexture::State::Dirty);
@@ -2484,6 +2483,20 @@ void D3D12Device::PreDispatchCheck()
       rt->TransitionToState(cmdlist, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
       rt->SetState(GPUTexture::State::Dirty);
     }
+
+    for (u32 i = 0; i < m_num_current_render_targets; i++)
+    {
+      D3D12Texture* const rt = m_current_render_targets[i];
+      if (!rt)
+        continue;
+
+      const D3D12_RESOURCE_BARRIER barrier = {
+        .Type = D3D12_RESOURCE_BARRIER_TYPE_UAV,
+        .Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE,
+        .UAV = {.pResource = rt->GetResource()},
+      };
+      cmdlist->ResourceBarrier(1, &barrier);
+    }
   }
 
   // If this is a new command buffer, bind the pipeline and such.