Mesa (main): turnip: fix vbs emission when there are holes in bindings

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6a16b6a74c3617205367ab1126b0d9150ca8dfe3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a16b6a74c3617205367ab1126b0d9150ca8dfe3

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Tue Oct  5 14:25:52 2021 +0300

turnip: fix vbs emission when there are holes in bindings

Otherwise we read garbage for bindings with value above
vertexBindingDescriptionCount.

Fixes vkd3d test "test_append_aligned_element"

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13195>

---

 src/freedreno/vulkan/tu_pipeline.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 4b9b7bbb8b9..d490f5c2022 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -2650,7 +2650,11 @@ tu_pipeline_builder_parse_vertex_input(struct tu_pipeline_builder *builder,
    const struct ir3_shader_variant *vs = builder->variants[MESA_SHADER_VERTEX];
    const struct ir3_shader_variant *bs = builder->binning_variant;
 
-   pipeline->num_vbs = vi_info->vertexBindingDescriptionCount;
+   /* Bindings may contain holes */
+   for (unsigned i = 0; i < vi_info->vertexBindingDescriptionCount; i++) {
+      pipeline->num_vbs =
+         MAX2(pipeline->num_vbs, vi_info->pVertexBindingDescriptions[i].binding + 1);
+   }
 
    struct tu_cs vi_cs;
    tu_cs_begin_sub_stream(&pipeline->cs,