Mesa (main): radv: only init DCC if compressed in the HW resolve path

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7af5a0c1b9703f8bc014d592fc0f7fdda8920f86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7af5a0c1b9703f8bc014d592fc0f7fdda8920f86

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu May  6 14:30:19 2021 +0200

radv: only init DCC if compressed in the HW resolve path

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10667>

---

 src/amd/vulkan/radv_meta_resolve.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index 4214992b26b..9a3bdac7057 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -497,7 +497,11 @@ radv_meta_resolve_hardware_image(struct radv_cmd_buffer *cmd_buffer, struct radv
    const struct VkOffset3D dstOffset =
       radv_sanitize_image_offset(dst_image->type, region->dstOffset);
 
-   if (radv_dcc_enabled(dst_image, region->dstSubresource.mipLevel)) {
+   uint32_t queue_mask = radv_image_queue_family_mask(dst_image, cmd_buffer->queue_family_index,
+                                                      cmd_buffer->queue_family_index);
+
+   if (radv_layout_dcc_compressed(cmd_buffer->device, dst_image, region->dstSubresource.mipLevel,
+                                  dst_image_layout, false, queue_mask)) {
       VkImageSubresourceRange range = {
          .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
          .baseMipLevel = region->dstSubresource.mipLevel,
@@ -692,8 +696,13 @@ radv_cmd_buffer_resolve_subpass_hw(struct radv_cmd_buffer *cmd_buffer)
 
       struct radv_image_view *dest_iview = cmd_buffer->state.attachments[dest_att.attachment].iview;
       struct radv_image *dst_img = dest_iview->image;
+      VkImageLayout dst_image_layout = cmd_buffer->state.attachments[dest_att.attachment].current_layout;
+
+      uint32_t queue_mask = radv_image_queue_family_mask(dst_img, cmd_buffer->queue_family_index,
+                                                         cmd_buffer->queue_family_index);
 
-      if (radv_dcc_enabled(dst_img, dest_iview->base_mip)) {
+      if (radv_layout_dcc_compressed(cmd_buffer->device, dst_img, dest_iview->base_mip,
+                                     dst_image_layout, false, queue_mask)) {
          VkImageSubresourceRange range = {
             .aspectMask = dest_iview->aspect_mask,
             .baseMipLevel = dest_iview->base_mip,