From f2b5446cc46f17f51e24a84d6e7e2584a702a740 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 13 Aug 2025 16:11:02 +0200 Subject: [PATCH] radv: use radv_write_sampler_descriptor() for combined image/sampler Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_descriptors.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_descriptors.h b/src/amd/vulkan/radv_descriptors.h index 9fba9551ba0..31dabba2b77 100644 --- a/src/amd/vulkan/radv_descriptors.h +++ b/src/amd/vulkan/radv_descriptors.h @@ -254,6 +254,13 @@ radv_write_image_descriptor_ycbcr_impl(struct radv_device *device, struct radv_c } } +static ALWAYS_INLINE void +radv_write_sampler_descriptor(unsigned *dst, VkSampler _sampler) +{ + VK_FROM_HANDLE(radv_sampler, sampler, _sampler); + memcpy(dst, sampler->state, RADV_SAMPLER_DESC_SIZE); +} + static ALWAYS_INLINE void radv_write_combined_image_sampler_descriptor(struct radv_device *device, struct radv_cmd_buffer *cmd_buffer, unsigned *dst, struct radeon_winsys_bo **buffer_list, @@ -263,20 +270,12 @@ radv_write_combined_image_sampler_descriptor(struct radv_device *device, struct radv_write_image_descriptor_impl(device, cmd_buffer, 64, dst, buffer_list, descriptor_type, image_info); /* copy over sampler state */ if (has_sampler) { - VK_FROM_HANDLE(radv_sampler, sampler, image_info->sampler); const uint32_t sampler_offset = RADV_COMBINED_IMAGE_SAMPLER_DESC_SAMPLER_OFFSET; - memcpy(dst + sampler_offset / sizeof(*dst), sampler->state, RADV_SAMPLER_DESC_SIZE); + radv_write_sampler_descriptor(dst + sampler_offset / sizeof(*dst), image_info->sampler); } } -static ALWAYS_INLINE void -radv_write_sampler_descriptor(unsigned *dst, VkSampler _sampler) -{ - VK_FROM_HANDLE(radv_sampler, sampler, _sampler); - memcpy(dst, sampler->state, RADV_SAMPLER_DESC_SIZE); -} - static ALWAYS_INLINE void radv_write_accel_struct_descriptor(struct radv_device *device, void *ptr, VkDeviceAddress va) {