From fa3b7ef943b770ccc11370d508b263ec0c114ac9 Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Thu, 4 May 2023 09:49:16 +0100 Subject: [PATCH] pvr: Fix off-by-one in pvr_cmd_buffer_upload_desc_set_table() assert Fixes: dEQP-VK.pipeline.monolithic.dynamic_offset.compute.multiset .uniform_buffer.numcmdbuffers_1.sameorder.numdescriptorsetbindings_1 .numdynamicbindings_2.numnondynamicbindings_1 Signed-off-by: Matt Coster Reported-by: James Glanville Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/pvr_cmd_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index d076edcb27d..7ed293c0c8c 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -3663,7 +3663,7 @@ pvr_cmd_buffer_upload_desc_set_table(struct pvr_cmd_buffer *const cmd_buffer, for (uint32_t set = 0; set < ARRAY_SIZE(bound_desc_sets); set++) bound_desc_sets[set] = ~0; - assert(util_last_bit(desc_state->valid_mask) < ARRAY_SIZE(bound_desc_sets)); + assert(util_last_bit(desc_state->valid_mask) <= ARRAY_SIZE(bound_desc_sets)); for (uint32_t set = 0; set < util_last_bit(desc_state->valid_mask); set++) { const struct pvr_descriptor_set *desc_set;