From c23f7a2562bbcc8b5dd7d3912b6f10bd60c875a8 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 21 Oct 2024 12:59:00 -0700 Subject: [PATCH] panvk: fix descriptor set layout hash Save the hash to layout->vk.blake3, rather than the unused layout->hash. Fixes: 73518dc169f ("panvk: Add Valhall DescriptorSetLayout implementation") Part-of: --- src/panfrost/vulkan/panvk_descriptor_set_layout.h | 1 - src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/panfrost/vulkan/panvk_descriptor_set_layout.h b/src/panfrost/vulkan/panvk_descriptor_set_layout.h index 057eb6a0802..57dd865b4d1 100644 --- a/src/panfrost/vulkan/panvk_descriptor_set_layout.h +++ b/src/panfrost/vulkan/panvk_descriptor_set_layout.h @@ -37,7 +37,6 @@ struct panvk_descriptor_set_binding_layout { struct panvk_descriptor_set_layout { struct vk_descriptor_set_layout vk; VkDescriptorSetLayoutCreateFlagBits flags; - blake3_hash hash; unsigned desc_count; unsigned dyn_buf_count; diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c index a79fada2d0d..7053423cf04 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c @@ -164,7 +164,7 @@ panvk_per_arch(CreateDescriptorSetLayout)( /* Immutable samplers are ignored for now */ } - _mesa_blake3_final(&hash_ctx, layout->hash); + _mesa_blake3_final(&hash_ctx, layout->vk.blake3); free(bindings); *pSetLayout = panvk_descriptor_set_layout_to_handle(layout);