From bd5c942cefc9f58aa6e8f6a9452f65e9d0d9d93a Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 18 Jan 2018 15:35:11 +0100 Subject: [PATCH] radv: Use correct bindings for inputRate in key generation. The bindings also have an index field. Fixes: 49d035122e "radv: Add single pipeline cache key." Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104677 Reviewed-by: Dave Airlie Reviewed-by: Samuel Pitoiset --- src/amd/vulkan/radv_pipeline.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index c3c17af8500..5f824796fe5 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1726,10 +1726,16 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline, key.has_multiview_view_index = has_view_index; + uint32_t binding_input_rate = 0; + for (unsigned i = 0; i < input_state->vertexBindingDescriptionCount; ++i) { + if (input_state->pVertexBindingDescriptions[i].inputRate) + binding_input_rate |= 1u << input_state->pVertexBindingDescriptions[i].binding; + } + for (unsigned i = 0; i < input_state->vertexAttributeDescriptionCount; ++i) { unsigned binding; binding = input_state->pVertexAttributeDescriptions[i].binding; - if (input_state->pVertexBindingDescriptions[binding].inputRate) + if (binding_input_rate & (1u << binding)) key.instance_rate_inputs |= 1u << input_state->pVertexAttributeDescriptions[i].location; } -- 2.30.2