zink: add layout to sampler descriptor hash

this can have more than one value, so avoid stale cache entries

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15173>

diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index 0440374..770edda 100644 (file)
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -1539,6 +1539,8 @@ calc_descriptor_state_hash_sampler(struct zink_context *ctx, struct zink_shader
       if (is_buffer)
          continue;
 
+      hash = XXH32(&ctx->di.textures[shader][idx + k].imageLayout, sizeof(VkImageLayout), hash);
+
       struct zink_sampler_state *sampler_state = ctx->sampler_states[shader][idx + k];
 
       if (sampler_state)