Mesa (master): radeonsi: revert hack for random failures in glsl-max-varyings

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Oct 14 22:51:10 2014 +0200

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 at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_draw.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 707e234..4f81dac 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;