From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 14 Oct 2014 20:51:10 +0000 (+0200)
Subject: radeonsi: revert hack for random failures in glsl-max-varyings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a18f803a860767be3604369d865b6c0df0d15f2a;p=mesa.git

radeonsi: revert hack for random failures in glsl-max-varyings

This reverts commit 032e5548b3d4b5efa52359218725cb8e31b622ad.

I've run glsl-max-varyings 30 times and it always passed.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 707e2343494..4f81dacadb5 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -680,14 +680,8 @@ static void si_update_derived_state(struct si_context *sctx)
 
 	si_pm4_bind_state(sctx, ps, sctx->ps_shader->current->pm4);
 
-	if (si_pm4_state_changed(sctx, ps) || si_pm4_state_changed(sctx, vs)) {
-		/* XXX: Emitting the PS state even when only the VS changed
-		 * fixes random failures with piglit glsl-max-varyings.
-		 * Not sure why...
-		 */
-		sctx->emitted.named.ps = NULL;
+	if (si_pm4_state_changed(sctx, ps) || si_pm4_state_changed(sctx, vs))
 		si_update_spi_map(sctx);
-	}
 
 	if (sctx->ps_db_shader_control != sctx->ps_shader->current->db_shader_control) {
 		sctx->ps_db_shader_control = sctx->ps_shader->current->db_shader_control;