From 7edfad763a6a627db3fc85df4b72390ad4086da6 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 12 Oct 2024 01:26:24 +0200
Subject: [PATCH] [dxvk] Use new barrier helpers in ensureImageCompatibility

---
 src/dxvk/dxvk_context.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index ee8b2b2bf..90551d31c 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -1488,8 +1488,7 @@ namespace dxvk {
     this->spillRenderPass(true);
     this->prepareImage(image, image->getAvailableSubresources());
 
-    if (m_execBarriers.isImageDirty(image, image->getAvailableSubresources(), DxvkAccess::Write))
-      m_execBarriers.recordCommands(m_cmd);
+    flushPendingAccesses(*image, image->getAvailableSubresources(), DxvkAccess::Write);
 
     if (isUsageAndFormatCompatible) {
       // Emit a barrier. If used in internal passes, this function
@@ -1499,7 +1498,7 @@ namespace dxvk {
 
       image->assignResourceWithUsage(image->getAllocation(), usageInfo);
 
-      m_execBarriers.accessImage(image, image->getAvailableSubresources(),
+      accessImage(DxvkCmdBuffer::ExecBuffer, *image, image->getAvailableSubresources(),
         oldLayout, image->info().stages, image->info().access,
         newLayout, image->info().stages, image->info().access);