radv: decompress mipmapped depth/stencil images during transitions

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

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 952f5e7d54c19354c7b79d97254f3e6a220b2e99..232cbff5c89e5b7ca962e7b3d7cf22dd5354a1fd 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5104,16 +5104,11 @@ static void radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffe
                radv_initialize_htile(cmd_buffer, image, range, clear_value);
        } else if (radv_layout_is_htile_compressed(image, src_layout, src_render_loop, src_queue_mask) &&
                   !radv_layout_is_htile_compressed(image, dst_layout, dst_render_loop, dst_queue_mask)) {
-               VkImageSubresourceRange local_range = *range;
-               local_range.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
-               local_range.baseMipLevel = 0;
-               local_range.levelCount = 1;
-
                cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB |
                                                RADV_CMD_FLAG_FLUSH_AND_INV_DB_META;
 
-               radv_decompress_depth_image_inplace(cmd_buffer, image,
-                                                   &local_range, sample_locs);
+               radv_decompress_depth_image_inplace(cmd_buffer, image, range,
+                                                   sample_locs);
 
                cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB |
                                                RADV_CMD_FLAG_FLUSH_AND_INV_DB_META;

diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h
index e916b788d0e61e2395fafdf89aa0ff820bbaf04f..53c562b5df65f56993c52fffd1ece4d265a95fef 100644 (file)
--- a/src/amd/vulkan/radv_meta.h
+++ b/src/amd/vulkan/radv_meta.h
@@ -169,11 +169,11 @@ void radv_meta_clear_image_cs(struct radv_cmd_buffer *cmd_buffer,
 
 void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                         struct radv_image *image,
-                                        VkImageSubresourceRange *subresourceRange,
+                                        const VkImageSubresourceRange *subresourceRange,
                                         struct radv_sample_locations_state *sample_locs);
 void radv_resummarize_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                          struct radv_image *image,
-                                         VkImageSubresourceRange *subresourceRange,
+                                         const VkImageSubresourceRange *subresourceRange,
                                          struct radv_sample_locations_state *sample_locs);
 void radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                         struct radv_image *image,

diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 3a0228c9dea6cd4a925cb6df79df502aa470116e..649a22cda7442b63ebee0c464de694ebc4498ecb 100644 (file)
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -430,7 +430,7 @@ radv_process_depth_image_layer(struct radv_cmd_buffer *cmd_buffer,
 
 static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                             struct radv_image *image,
-                                            VkImageSubresourceRange *subresourceRange,
+                                            const VkImageSubresourceRange *subresourceRange,
                                             struct radv_sample_locations_state *sample_locs,
                                             enum radv_depth_op op)
 {
@@ -501,7 +501,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 
 void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                         struct radv_image *image,
-                                        VkImageSubresourceRange *subresourceRange,
+                                        const VkImageSubresourceRange *subresourceRange,
                                         struct radv_sample_locations_state *sample_locs)
 {
        assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL);
@@ -511,7 +511,7 @@ void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 
 void radv_resummarize_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                         struct radv_image *image,
-                                        VkImageSubresourceRange *subresourceRange,
+                                        const VkImageSubresourceRange *subresourceRange,
                                         struct radv_sample_locations_state *sample_locs)
 {
        assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL);