tu: Fix wrong copies of sampler descriptor.

Found this with the following patch but it exists since adding ycbcr
sampler to the struct.

Fixes: d070a7ba0cfb11f1e01774b9dd3775ab7cd0c4ea
Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>

diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c
index ec2a940e858fc7c01fe6b7e1acfc5858f1544a13..9dbd85b1646f28f62bdc0108f777fa4467d15c21 100644 (file)
--- a/src/freedreno/vulkan/tu_descriptor_set.c
+++ b/src/freedreno/vulkan/tu_descriptor_set.c
@@ -849,7 +849,7 @@ write_combined_image_sampler_descriptor(struct tu_device *device,
                           descriptor_type, image_info);
    /* copy over sampler state */
    if (has_sampler) {
-      memcpy(dst + A6XX_TEX_CONST_DWORDS, sampler, sizeof(*sampler));
+      memcpy(dst + A6XX_TEX_CONST_DWORDS, sampler->descriptor, sizeof(sampler->descriptor));
    }
 }
 
@@ -860,7 +860,7 @@ write_sampler_descriptor(struct tu_device *device,
 {
    TU_FROM_HANDLE(tu_sampler, sampler, image_info->sampler);
 
-   memcpy(dst, sampler, sizeof(*sampler));
+   memcpy(dst, sampler->descriptor, sizeof(sampler->descriptor));
 }
 
 void