From 525c1dd95bd6cb4337110f68d588f632d6df9012 Mon Sep 17 00:00:00 2001
From: Sarah Walker <sarah.walker@imgtec.com>
Date: Fri, 28 Oct 2022 15:14:15 +0100
Subject: [PATCH] pvr: Fix segfault in pvr_CreatePipelineLayout when layout has
 zero bindings

Signed-off-by: Sarah Walker <sarah.walker@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19407>
---
 src/imagination/vulkan/pvr_descriptor_set.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c
index a9ba0f4b42a..69d3984b5ba 100644
--- a/src/imagination/vulkan/pvr_descriptor_set.c
+++ b/src/imagination/vulkan/pvr_descriptor_set.c
@@ -893,6 +893,9 @@ VkResult pvr_CreatePipelineLayout(VkDevice _device,
             layout->descriptor_offsets[set_num][stage][type] =
                descriptor_counts[type];
 
+            if (!layout->set_layout[set_num]->descriptor_count)
+               continue;
+
             descriptor_count = layout->set_layout[set_num]
                                   ->per_stage_descriptor_count[stage][type];