From e60cafa533fa0573e397de2bc73407f9c5ebf0fd Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 19 Mar 2025 11:54:16 +0100 Subject: [PATCH] radv: remove useless parameter to radv_sdma_get_buf_surf() Same aspect mask is passed through. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meta/radv_meta_copy.c | 2 +- src/amd/vulkan/radv_sdma.c | 5 ++--- src/amd/vulkan/radv_sdma.h | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c index 3a07ef36265..df04cf193d6 100644 --- a/src/amd/vulkan/meta/radv_meta_copy.c +++ b/src/amd/vulkan/meta/radv_meta_copy.c @@ -82,7 +82,7 @@ transfer_copy_memory_image(struct radv_cmd_buffer *cmd_buffer, uint64_t buffer_v struct radeon_cmdbuf *cs = cmd_buffer->cs; const VkImageAspectFlags aspect_mask = region->imageSubresource.aspectMask; - struct radv_sdma_surf buf = radv_sdma_get_buf_surf(buffer_va, image, region, aspect_mask); + struct radv_sdma_surf buf = radv_sdma_get_buf_surf(buffer_va, image, region); const struct radv_sdma_surf img = radv_sdma_get_surf(device, image, region->imageSubresource, region->imageOffset, aspect_mask); const VkExtent3D extent = radv_sdma_get_copy_extent(image, region->imageSubresource, region->imageExtent); diff --git a/src/amd/vulkan/radv_sdma.c b/src/amd/vulkan/radv_sdma.c index c814fd138dd..c43bd2d1d1f 100644 --- a/src/amd/vulkan/radv_sdma.c +++ b/src/amd/vulkan/radv_sdma.c @@ -164,10 +164,9 @@ radv_sdma_get_bpe(const struct radv_image *const image, VkImageAspectFlags aspec } struct radv_sdma_surf -radv_sdma_get_buf_surf(uint64_t buffer_va, const struct radv_image *const image, const VkBufferImageCopy2 *const region, - const VkImageAspectFlags aspect_mask) +radv_sdma_get_buf_surf(uint64_t buffer_va, const struct radv_image *const image, const VkBufferImageCopy2 *const region) { - assert(util_bitcount(aspect_mask) == 1); + assert(util_bitcount(region->imageSubresource.aspectMask) == 1); const unsigned pitch = (region->bufferRowLength ? region->bufferRowLength : region->imageExtent.width); const unsigned slice_pitch = diff --git a/src/amd/vulkan/radv_sdma.h b/src/amd/vulkan/radv_sdma.h index bdb66536f2c..22b29be0ec4 100644 --- a/src/amd/vulkan/radv_sdma.h +++ b/src/amd/vulkan/radv_sdma.h @@ -52,8 +52,7 @@ radv_sdma_get_copy_extent(const struct radv_image *const image, const VkImageSub } struct radv_sdma_surf radv_sdma_get_buf_surf(uint64_t buffer_va, const struct radv_image *const image, - const VkBufferImageCopy2 *const region, - const VkImageAspectFlags aspect_mask); + const VkBufferImageCopy2 *const region); struct radv_sdma_surf radv_sdma_get_surf(const struct radv_device *const device, const struct radv_image *const image, const VkImageSubresourceLayers subresource, const VkOffset3D offset, const VkImageAspectFlags aspect_mask);