Mesa (master): radeonsi: fix context roll tracking in si_emit_shader_vs

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 898c9cb797b064cbbf0dd71be091a52f5292540a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=898c9cb797b064cbbf0dd71be091a52f5292540a

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Dec 24 13:46:38 2019 -0500

radeonsi: fix context roll tracking in si_emit_shader_vs

probably harmless, because we don't need to track context rolls on gfx10

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index bf4a22de13b..c5412f3b143 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1312,9 +1312,6 @@ static void si_emit_shader_vs(struct si_context *sctx)
 					   SI_TRACKED_VGT_VERTEX_REUSE_BLOCK_CNTL,
 					   shader->vgt_vertex_reuse_block_cntl);
 
-	if (initial_cdw != sctx->gfx_cs->current.cdw)
-		sctx->context_roll = true;
-
 	/* Required programming for tessellation. (legacy pipeline only) */
 	if (sctx->chip_class == GFX10 &&
 	    shader->selector->type == PIPE_SHADER_TESS_EVAL) {
@@ -1331,6 +1328,9 @@ static void si_emit_shader_vs(struct si_context *sctx)
 					       shader->pa_cl_vs_out_cntl,
 					       SI_TRACKED_PA_CL_VS_OUT_CNTL__VS_MASK);
 	}
+
+	if (initial_cdw != sctx->gfx_cs->current.cdw)
+		sctx->context_roll = true;
 }
 
 /**