From e63adf8b1ea56c9c2d0794f563bced765fb8300a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Thu, 11 Jan 2018 11:15:30 +0100 Subject: [PATCH] anv: VkDescriptorSetLayoutBinding can have descriptorCount == 0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit From Vulkan spec: "descriptorCount is the number of descriptors contained in the binding, accessed in a shader as an array. If descriptorCount is zero this binding entry is reserved and the resource must not be accessed from any stage via this binding within any pipeline using the set layout." Fixes: dEQP-VK.binding_model.descriptor_update.empty_descriptor.uniform_buffer Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Lionel Landwerlin Cc: mesa-stable@lists.freedesktop.org --- src/intel/vulkan/anv_descriptor_set.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 629c041eedf..e4e39f5c7b4 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -103,7 +103,9 @@ VkResult anv_CreateDescriptorSetLayout( if (binding == NULL) continue; - assert(binding->descriptorCount > 0); + if (binding->descriptorCount == 0) + continue; + #ifndef NDEBUG set_layout->binding[b].type = binding->descriptorType; #endif -- 2.30.2