From d2d2fdf934e831c4b12a1afea599b5f1e6bb0778 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Wed, 20 Jul 2022 09:56:30 +0200 Subject: [PATCH] v3dv: remove assert that poolSizeCount must be larger than 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the Vulkan spec: "If poolSizeCount is not 0, pPoolSizes must be a valid pointer to an array of poolSizeCount valid VkDescriptorPoolSize structures" So 0 is actually allowed and there is a CTS to check it is handled gracefully. Fixes: dEQP-VK.api.descriptor_pool.zero_pool_size_count Reviewed-by: Alejandro Piñeiro Reviewed-by: Juan A. Suarez Part-of: --- src/broadcom/ci/broadcom-rpi4-fails.txt | 1 - src/broadcom/vulkan/v3dv_descriptor_set.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index 1a359418466..a06645e5d2b 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -364,7 +364,6 @@ spec@!opengl 2.0@max-samplers border,Fail dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more0,Crash # New in CTS 1.3.3.0 -dEQP-VK.api.descriptor_pool.zero_pool_size_count,Crash dEQP-VK.image.subresource_layout.2d.1_level.a1r5g5b5_unorm_pack16_offset,Fail dEQP-VK.image.subresource_layout.2d.1_level.a2b10g10r10_uint_pack32_offset,Fail dEQP-VK.image.subresource_layout.2d.1_level.a2b10g10r10_unorm_pack32_offset,Fail diff --git a/src/broadcom/vulkan/v3dv_descriptor_set.c b/src/broadcom/vulkan/v3dv_descriptor_set.c index 8e0c1f693f0..104ca0d19a3 100644 --- a/src/broadcom/vulkan/v3dv_descriptor_set.c +++ b/src/broadcom/vulkan/v3dv_descriptor_set.c @@ -421,7 +421,6 @@ v3dv_CreateDescriptorPool(VkDevice _device, vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO); - assert(pCreateInfo->poolSizeCount > 0); for (unsigned i = 0; i < pCreateInfo->poolSizeCount; ++i) { /* Verify supported descriptor type */ switch(pCreateInfo->pPoolSizes[i].type) {