From e8c614b88e0cf1d765d9b2d63935caef20211192 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 14 May 2025 03:19:09 -0400 Subject: [PATCH] vulkan/pipeline: Hash null descriptor robustness info Fixes: 6ae401aa8680 ("vulkan: Add null descriptor bits to vk_pipeline_robustness_state") Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 347e957b44746bbe417d77f19113463da6817d58) --- .pick_status.json | 2 +- src/vulkan/runtime/vk_pipeline.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index a8dc5db7a6c..16d7f2f68ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -774,7 +774,7 @@ "description": "vulkan/pipeline: Hash null descriptor robustness info", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6ae401aa868066eecbe6307c6e8173525f566580", "notes": null diff --git a/src/vulkan/runtime/vk_pipeline.c b/src/vulkan/runtime/vk_pipeline.c index 9610112776c..a680532019b 100644 --- a/src/vulkan/runtime/vk_pipeline.c +++ b/src/vulkan/runtime/vk_pipeline.c @@ -255,6 +255,10 @@ vk_pipeline_hash_shader_stage(VkPipelineCreateFlags2KHR pipeline_flags, _mesa_sha1_update(&ctx, &rstate->uniform_buffers, sizeof(rstate->uniform_buffers)); _mesa_sha1_update(&ctx, &rstate->vertex_inputs, sizeof(rstate->vertex_inputs)); _mesa_sha1_update(&ctx, &rstate->images, sizeof(rstate->images)); + _mesa_sha1_update(&ctx, &rstate->null_uniform_buffer_descriptor, + sizeof(rstate->null_uniform_buffer_descriptor)); + _mesa_sha1_update(&ctx, &rstate->null_storage_buffer_descriptor, + sizeof(rstate->null_storage_buffer_descriptor)); } _mesa_sha1_update(&ctx, info->pName, strlen(info->pName));