From bac6062d10d7665cf7de192aafd70a03263ba751 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 14 Feb 2023 21:51:55 -0800 Subject: [PATCH] turnip: fix a null descriptor set dereference Fixed dEQP-VK.pipeline.pipeline_library.graphics_library.misc.other.null_descriptor_set_in_monolithic_pipeline. Fixes: cb3872f2cdc ("tu: Implement VK_EXT_descriptor_buffer") Part-of: --- src/freedreno/vulkan/tu_cmd_buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 7950b6acd81..d6a04246a07 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -2174,7 +2174,8 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, TU_FROM_HANDLE(tu_descriptor_set, set, pDescriptorSets[i]); descriptors_state->sets[idx] = set; - descriptors_state->set_iova[idx] = set->va | BINDLESS_DESCRIPTOR_64B; + descriptors_state->set_iova[idx] = set ? + (set->va | BINDLESS_DESCRIPTOR_64B) : 0; if (!set) continue;