From ab300dce2fe8fee50f629428dbc92a4c29880621 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 12 Oct 2024 09:05:42 +0200
Subject: [PATCH] [dxvk] Use new barrier helpers in performClear

---
 src/dxvk/dxvk_context.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 23121542b..b560e00c8 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -1772,8 +1772,7 @@ namespace dxvk {
     if (attachmentIndex < 0) {
       bool hasViewFormatMismatch = imageView->info().format != imageView->image()->info().format;
 
-      if (m_execBarriers.isImageDirty(imageView->image(), imageView->imageSubresources(), DxvkAccess::Write))
-        m_execBarriers.recordCommands(m_cmd);
+      flushPendingAccesses(*imageView, DxvkAccess::Write);
 
       // Set up a temporary render pass to execute the clear
       VkImageLayout imageLayout = ((clearAspects | discardAspects) & VK_IMAGE_ASPECT_COLOR_BIT)
@@ -1856,11 +1855,9 @@ namespace dxvk {
 
       m_cmd->cmdEndRendering();
 
-      m_execBarriers.accessImage(
-        imageView->image(),
-        imageView->imageSubresources(),
-        imageLayout, clearStages, clearAccess,
-        storeLayout,
+      accessImage(DxvkCmdBuffer::ExecBuffer,
+        *imageView->image(), imageView->imageSubresources(),
+        imageLayout, clearStages, clearAccess, storeLayout,
         imageView->image()->info().stages,
         imageView->image()->info().access);