From 08e1af52ee1c7af65951d1fb907fb34c077cfc3c Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Fri, 2 Sep 2022 10:56:12 -0500
Subject: [PATCH] radv: Leave image layouts alone when doing HW MSAA resolves

If the current layout supports DCC, we initialize it.  There's no reason
why we can't leave it in that layout and need to stomp it to
COLOR_ATTACHMENT_OPTIMAL.  If the layout supports DCC, it's effectively
identical to COLOR_ATTACHMENT_OPTIMAL anyway.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15587>
---
 src/amd/vulkan/radv_meta_resolve.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index 72f55fbca02..983833f5309 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -600,8 +600,6 @@ radv_cmd_buffer_resolve_subpass_hw(struct radv_cmd_buffer *cmd_buffer)
          };
 
          cmd_buffer->state.flush_bits |= radv_init_dcc(cmd_buffer, dst_img, &range, 0xffffffff);
-         saved_state.attachments[dst_att.attachment].current_layout =
-            VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
       }
 
       const VkRenderingAttachmentInfo color_atts[2] = {