From a3f2c5f05ebb7e654739ea83e55affb40bc71892 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 10 Apr 2025 17:47:22 +0200 Subject: [PATCH] radv/meta: remove unnecessary radv_meta_blit2d_buffer::bs Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meta/radv_meta.h | 1 - src/amd/vulkan/meta/radv_meta_copy.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 1859b01be6f..2db9b7aaf44 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -148,7 +148,6 @@ struct radv_meta_blit2d_buffer { uint64_t size; uint32_t offset; uint32_t pitch; - uint8_t bs; VkFormat format; enum radv_copy_flags copy_flags; }; diff --git a/src/amd/vulkan/meta/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c index 5acf9cb6d2b..aa60e777adf 100644 --- a/src/amd/vulkan/meta/radv_meta_copy.c +++ b/src/amd/vulkan/meta/radv_meta_copy.c @@ -170,7 +170,6 @@ copy_memory_to_image(struct radv_cmd_buffer *cmd_buffer, uint64_t buffer_addr, u struct radv_meta_blit2d_buffer buf_bsurf = { .addr = buffer_addr, .size = buffer_size, - .bs = img_bsurf.bs, .format = img_bsurf.format, .offset = region->bufferOffset, .pitch = buf_layout.row_stride_B / buf_layout.element_size_B, @@ -335,7 +334,6 @@ copy_image_to_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t buffer_addr, u struct radv_meta_blit2d_buffer buf_info = { .addr = buffer_addr, .size = buffer_size, - .bs = img_info.bs, .format = img_info.format, .offset = region->bufferOffset, .pitch = buf_extent_el.width, @@ -357,7 +355,7 @@ copy_image_to_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t buffer_addr, u /* Perform Blit */ radv_meta_image_to_buffer(cmd_buffer, &img_info, &buf_info, &rect); - buf_info.offset += buf_extent_el.width * buf_extent_el.height * buf_info.bs; + buf_info.offset += buf_extent_el.width * buf_extent_el.height * img_info.bs; img_info.layer++; if (image->vk.image_type == VK_IMAGE_TYPE_3D) slice_3d++;