Mesa (main): radv: fix writing combined image/sampler descriptor

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 87505442defc6a46b717c474877b06abad97add6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87505442defc6a46b717c474877b06abad97add6

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Oct  4 13:22:59 2021 +0200

radv: fix writing combined image/sampler descriptor

This will crash with the common Vulkan handles if sampler is NULL.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13172>

---

 src/amd/vulkan/radv_descriptor_set.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index df30c4f1148..c752fceed87 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -1081,12 +1081,11 @@ write_combined_image_sampler_descriptor(struct radv_device *device,
                                         VkDescriptorType descriptor_type,
                                         const VkDescriptorImageInfo *image_info, bool has_sampler)
 {
-   RADV_FROM_HANDLE(radv_sampler, sampler, image_info->sampler);
-
    write_image_descriptor(device, cmd_buffer, sampler_offset, dst, buffer_list, descriptor_type,
                           image_info);
    /* copy over sampler state */
    if (has_sampler) {
+      RADV_FROM_HANDLE(radv_sampler, sampler, image_info->sampler);
       memcpy(dst + sampler_offset / sizeof(*dst), sampler->state, 16);
    }
 }