radv: fix getting the vertex strides if the bindings aren't contiguous

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110349
Fixes: a66b186bebf ("radv: use typed buffer loads for vertex input fetches")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 83a06226adaba5a78badd1343af8442b9dcf04d2..d96ae9a42239f0629eacc13e7c77c15e8747a55f 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1827,6 +1827,20 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders)
        }
 }
 
+static uint32_t
+radv_get_attrib_stride(const VkPipelineVertexInputStateCreateInfo *input_state,
+                      uint32_t attrib_binding)
+{
+       for (uint32_t i = 0; i < input_state->vertexBindingDescriptionCount; i++) {
+               const VkVertexInputBindingDescription *input_binding =
+                       &input_state->pVertexBindingDescriptions[i];
+
+               if (input_binding->binding == attrib_binding)
+                       return input_binding->stride;
+       }
+
+       return 0;
+}
 
 static struct radv_pipeline_key
 radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
@@ -1886,7 +1900,7 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
                key.vertex_attribute_formats[location] = data_format | (num_format << 4);
                key.vertex_attribute_bindings[location] = desc->binding;
                key.vertex_attribute_offsets[location] = desc->offset;
-               key.vertex_attribute_strides[location] = input_state->pVertexBindingDescriptions[desc->binding].stride;
+               key.vertex_attribute_strides[location] = radv_get_attrib_stride(input_state, desc->binding);
 
                if (pipeline->device->physical_device->rad_info.chip_class <= VI &&
                    pipeline->device->physical_device->rad_info.family != CHIP_STONEY) {