radeonsi: move *rs to its only use in si_draw
authorMarek Olšák <marek.olsak@amd.com>
Sun, 14 Aug 2022 07:27:53 +0000 (03:27 -0400)
committerMarge Bot <emma+marge@anholt.net>
Tue, 30 Aug 2022 04:57:43 +0000 (04:57 +0000)
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18195>

src/gallium/drivers/radeonsi/si_state_draw.cpp

index b535d80..9e2573c 100644 (file)
@@ -2343,7 +2343,6 @@ static void si_draw(struct pipe_context *ctx,
       }
    }
 
-   struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
    bool primitive_restart =
       info->primitive_restart &&
       (!sctx->screen->options.prim_restart_tri_strips_only ||
@@ -2414,6 +2413,8 @@ static void si_draw(struct pipe_context *ctx,
            * until we pass the total_direct_count check and then it stays enabled until
            * the shader is changed. This eliminates most culling on/off state changes. */
           (old_ngg_culling || total_direct_count > hw_vs->ngg_cull_vert_threshold)) {
+         struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
+
          /* Check that the current shader allows culling. */
          assert(hw_vs->ngg_cull_vert_threshold != UINT_MAX);