radeonsi: ignore the vertex element count in si_shader_selector_key_vs
authorMarek Olšák <marek.olsak@amd.com>
Tue, 10 Aug 2021 08:55:08 +0000 (04:55 -0400)
committerMarge Bot <eric+marge@anholt.net>
Fri, 10 Sep 2021 23:32:02 +0000 (23:32 +0000)
It's always at least num_inputs, so just use num_inputs.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12812>

src/gallium/drivers/radeonsi/si_state_shaders.c

index 5ee2711..00352dd 100644 (file)
@@ -1779,8 +1779,7 @@ void si_shader_selector_key_vs(struct si_context *sctx, struct si_shader_selecto
    prolog_key->instance_divisor_is_one = elts->instance_divisor_is_one;
    prolog_key->instance_divisor_is_fetched = elts->instance_divisor_is_fetched;
 
-   unsigned count = MIN2(vs->info.num_inputs, elts->count);
-   unsigned count_mask = (1 << count) - 1;
+   unsigned count_mask = (1 << vs->info.num_inputs) - 1;
    unsigned fix = elts->fix_fetch_always & count_mask;
    unsigned opencode = elts->fix_fetch_opencode & count_mask;