From a7e2efa7c95b78373d8a4b7b88ceb7b3769e6eaa Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 8 Apr 2020 13:53:47 +0200 Subject: [PATCH] radv: Use correct buffer count with variable descriptor set sizes. Fixes dEQP-VK.binding_model.descriptorset_random.sets16.noarray.ubolimitlow.sbolimitlow.imglimitlow.iublimitlow.frag.ialimitlow.0 CC: Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2607 Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/amd/vulkan/radv_descriptor_set.c | 1 + src/amd/vulkan/radv_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 811a21cf3ed..5cab9c829dc 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3554,7 +3554,7 @@ radv_bind_descriptor_set(struct radv_cmd_buffer *cmd_buffer, assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); if (!cmd_buffer->device->use_global_bo_list) { - for (unsigned j = 0; j < set->layout->buffer_count; ++j) + for (unsigned j = 0; j < set->buffer_count; ++j) if (set->descriptors[j]) radv_cs_add_buffer(ws, cmd_buffer->cs, set->descriptors[j]); } diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 473503b9789..33947ea3726 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -512,6 +512,7 @@ radv_descriptor_set_create(struct radv_device *device, } set->layout = layout; + set->buffer_count = buffer_count; uint32_t layout_size = layout->size; if (variable_count) { assert(layout->has_variable_descriptors); diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 0dd49959fa3..24a04c4e6a5 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -896,6 +896,7 @@ struct radv_descriptor_range { struct radv_descriptor_set { const struct radv_descriptor_set_layout *layout; uint32_t size; + uint32_t buffer_count; struct radeon_winsys_bo *bo; uint64_t va; -- 2.30.2