radeonsi: revert hack for random failures in glsl-max-varyings
authorMarek Olšák <marek.olsak@amd.com>
Tue, 14 Oct 2014 20:51:10 +0000 (22:51 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 21 Oct 2014 20:17:29 +0000 (22:17 +0200)
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>
src/gallium/drivers/radeonsi/si_state_draw.c

index 707e2343494dec0c1ad2caebb03a5d4dc2b106e6..4f81dacadb506961560e9e996e743c042a4e4f2f 100644 (file)
@@ -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;