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: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2607
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4489>

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 811a21c..5cab9c8 100644 (file)
--- 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 473503b..33947ea 100644 (file)
--- 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 0dd4995..24a04c4 100644 (file)
--- 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;