radv: decompress DCC for multisampled source images before resolving

Multisampled source images (ie. color attachments) can be now
DCC compressed, so the driver needs to perform a DCC decompression
pass before resolving

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h
index 47eec5cd6a0f5aeb5feb338034bcb120deeac3ef..4a9abae30ac36176fb96e32ce2a1294f034b2c2e 100644 (file)
--- a/src/amd/vulkan/radv_meta.h
+++ b/src/amd/vulkan/radv_meta.h
@@ -195,6 +195,7 @@ void radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer);
 
 void radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
                                 struct radv_image *src_image,
+                                VkImageLayout src_image_layout,
                                 uint32_t region_count,
                                 const VkImageResolve *regions);
 

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index d66f1c9f933c590954827c9bb9193c0eb37ac46b..f3e088b10c4869c4dd29486170eacd33b22601be 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -697,7 +697,8 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
                region.srcSubresource.mipLevel = 0;
                region.srcSubresource.layerCount = 1;
 
-               radv_decompress_resolve_src(cmd_buffer, src_image, 1, &region);
+               radv_decompress_resolve_src(cmd_buffer, src_image,
+                                           src_att.layout, 1, &region);
        }
 }
 
@@ -707,6 +708,7 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
 void
 radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
                            struct radv_image *src_image,
+                           VkImageLayout src_image_layout,
                            uint32_t region_count,
                            const VkImageResolve *regions)
 {
@@ -722,6 +724,17 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
                range.baseArrayLayer = src_base_layer;
                range.layerCount = region->srcSubresource.layerCount;
 
-               radv_fast_clear_flush_image_inplace(cmd_buffer, src_image, &range);
+               uint32_t queue_mask =
+                       radv_image_queue_family_mask(src_image,
+                                                    cmd_buffer->queue_family_index,
+                                                    cmd_buffer->queue_family_index);
+
+               if (radv_layout_dcc_compressed(src_image, src_image_layout,
+                                              queue_mask)) {
+                       radv_decompress_dcc(cmd_buffer, src_image, &range);
+               } else {
+                       radv_fast_clear_flush_image_inplace(cmd_buffer,
+                                                           src_image, &range);
+               }
        }
 }

diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c
index ede55f6d0054e53c6df47793a39cd6603c7a9947..274e64999a5c6a8a35726bba13bbededb31cc665 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/radv_meta_resolve_cs.c
@@ -388,7 +388,7 @@ void radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer,
 {
        struct radv_meta_saved_state saved_state;
 
-       radv_decompress_resolve_src(cmd_buffer, src_image,
+       radv_decompress_resolve_src(cmd_buffer, src_image, src_image_layout,
                                    region_count, regions);
 
        radv_meta_save(&saved_state, cmd_buffer,

diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c
index 499b3ae27af5031f7bb1470568a0ee68aa107950..ef8c1d8b1da5c796ef69645f8376e8b61faff15b 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_fs.c
+++ b/src/amd/vulkan/radv_meta_resolve_fs.c
@@ -458,7 +458,7 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer,
        unsigned dst_layout = radv_meta_dst_layout_from_layout(dest_image_layout);
        VkRenderPass rp;
 
-       radv_decompress_resolve_src(cmd_buffer, src_image,
+       radv_decompress_resolve_src(cmd_buffer, src_image, src_image_layout,
                                    region_count, regions);
 
        rp = device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key][dst_layout];