From fcfb957ad586dce30bbe4aeef3ec53aaa9600b0c 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: (cherry picked from commit c23f7a2562bbcc8b5dd7d3912b6f10bd60c875a8) --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_descriptor_set_layout.h | 1 - src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 15751f45333..8e39b766fe2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -114,7 +114,7 @@ "description": "panvk: fix descriptor set layout hash", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "73518dc169fc8d2b3cf8221d9244cba3d0e4bb16", "notes": null diff --git a/src/panfrost/vulkan/panvk_descriptor_set_layout.h b/src/panfrost/vulkan/panvk_descriptor_set_layout.h index e29ed877c0c..f86cc4003a2 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 e2e4b1c712c..fedb8fad5fb 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c @@ -190,7 +190,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);