From 6753936d0e43436b7407f49968fac0e79ef13187 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 1 Feb 2021 13:19:26 +0100 Subject: [PATCH] radv: Do not hash vk_object_base in descriptor set layout. It contains potentially pointer-y stuff. Fixes: 178adfa6a8e ("radv: use the base object struct types") Acked-by: Jason Ekstrand Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 1eaefe6cfd16186a88dbc1205c0cf16996bec0b6) --- .pick_status.json | 2 +- src/amd/vulkan/radv_descriptor_set.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3464fa6b7fd..3bc18848a5a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1687,7 +1687,7 @@ "description": "radv: Do not hash vk_object_base in descriptor set layout.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "178adfa6a8e5694a077c3e11fdcc5bc0802839ab" }, diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 5643cd806fe..b477b874981 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -504,7 +504,13 @@ VkResult radv_CreatePipelineLayout( } dynamic_offset_count += layout->set[set].dynamic_offset_count; dynamic_shader_stages |= layout->set[set].dynamic_offset_stages; - _mesa_sha1_update(&ctx, set_layout, set_layout->layout_size); + + /* Hash the entire set layout except for the vk_object_base. The + * rest of the set layout is carefully constructed to not have + * pointers so a full hash instead of a per-field hash should be ok. */ + _mesa_sha1_update(&ctx, + (const char*)set_layout + sizeof(struct vk_object_base), + set_layout->layout_size - sizeof(struct vk_object_base)); } layout->dynamic_offset_count = dynamic_offset_count;