fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 19:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: fix descriptor set layout hash

Browse source 
Save the hash to layout->vk.blake3, rather than the unused layout->hash.

Fixes: 73518dc169 ("panvk: Add Valhall DescriptorSetLayout implementation")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31773>
(cherry picked from commit c23f7a2562)
This commit is contained in:
Chia-I Wu 2024-10-21 12:59:00 -07:00 • committed by Eric Engestrom
parent 2f2b79a495
commit fcfb957ad5
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

1
src/panfrost/vulkan/panvk_descriptor_set_layout.h
View file

@ -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;

2
src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c
View file

@ -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);