radeonsi: store sctx->vertex_elements in a local in si_shader_selector_key_vs
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 1 Apr 2019 13:45:25 +0000 (15:45 +0200)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 13 May 2019 15:07:23 +0000 (17:07 +0200)
Purely as a shorthand in the remainder of the function.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_state_shaders.c

index db4c77da2ff5e7020285c30b1e6950e317c7b762..a9c5c7b9e4d9004f8e319840b097a46dd8b44d09 100644 (file)
@@ -1379,19 +1379,18 @@ static void si_shader_selector_key_vs(struct si_context *sctx,
            vs->info.properties[TGSI_PROPERTY_VS_BLIT_SGPRS])
                return;
 
-       prolog_key->instance_divisor_is_one =
-               sctx->vertex_elements->instance_divisor_is_one;
-       prolog_key->instance_divisor_is_fetched =
-               sctx->vertex_elements->instance_divisor_is_fetched;
+       struct si_vertex_elements *elts = sctx->vertex_elements;
+
+       prolog_key->instance_divisor_is_one = elts->instance_divisor_is_one;
+       prolog_key->instance_divisor_is_fetched = elts->instance_divisor_is_fetched;
 
        /* Prefer a monolithic shader to allow scheduling divisions around
         * VBO loads. */
        if (prolog_key->instance_divisor_is_fetched)
                key->opt.prefer_mono = 1;
 
-       unsigned count = MIN2(vs->info.num_inputs,
-                             sctx->vertex_elements->count);
-       memcpy(key->mono.vs_fix_fetch, sctx->vertex_elements->fix_fetch, count);
+       unsigned count = MIN2(vs->info.num_inputs, elts->count);
+       memcpy(key->mono.vs_fix_fetch, elts->fix_fetch, count);
 }
 
 static void si_shader_selector_key_hw_vs(struct si_context *sctx,