anv: hash immutable sampler conversion data not pointers
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Tue, 28 Mar 2023 09:52:21 +0000 (12:52 +0300)
committerMarge Bot <emma+marge@anholt.net>
Thu, 30 Mar 2023 00:31:20 +0000 (00:31 +0000)
The conversion pointer has a vk_object_base containing pointers.

Previous commits had a similar issue, storing an internal pointer to
the array of formats in anv_format.c

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Marcin Ĺšlusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22160>

src/intel/vulkan/anv_descriptor_set.c

index 84c2dc6..128d035 100644 (file)
@@ -696,8 +696,7 @@ sha1_update_immutable_sampler(struct mesa_sha1 *ctx,
       return;
 
    /* The only thing that affects the shader is ycbcr conversion */
-   _mesa_sha1_update(ctx, sampler->conversion,
-                     sizeof(*sampler->conversion));
+   SHA1_UPDATE_VALUE(ctx, sampler->conversion->state);
 }
 
 static void