From 9389a0ca966f9c68b11840c7d742ed6fbd682409 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 17 Feb 2025 01:11:33 +0100
Subject: [PATCH] [dxvk] Don't transition image layout in clearImageViewCs
unless necessary
---
src/dxvk/dxvk_context.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 0b7c7ce16..2528bdb83 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -3879,10 +3879,14 @@ namespace dxvk {
str::format("Clear view (", dstName ? dstName : "unknown", ")").c_str()));
}
- addImageLayoutTransition(*imageView->image(), imageView->imageSubresources(),
- VK_IMAGE_LAYOUT_GENERAL, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT,
- imageView->image()->isFullSubresource(vk::pickSubresourceLayers(imageView->imageSubresources(), 0), extent));
- flushImageLayoutTransitions(cmdBuffer);
+ // Avoid inserting useless barriers if the image is already in the correct layout
+ if (imageView->image()->info().layout != VK_IMAGE_LAYOUT_GENERAL
+ || !imageView->image()->isInitialized(imageView->imageSubresources())) {
+ addImageLayoutTransition(*imageView->image(), imageView->imageSubresources(),
+ VK_IMAGE_LAYOUT_GENERAL, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT,
+ imageView->image()->isFullSubresource(vk::pickSubresourceLayers(imageView->imageSubresources(), 0), extent));
+ flushImageLayoutTransitions(cmdBuffer);
+ }
// Query pipeline objects to use for this clear operation
DxvkMetaClearPipeline pipeInfo = m_common->metaClear().getClearImagePipeline(