radeonsi: Emit pixel shader state even when only the vertex shader changed

Fixes random failures with piglit glsl-max-varyings.

NOTE: This is a candidate for the 9.1 branch.

Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 1049d2b..a78751b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -404,6 +404,11 @@ static void si_update_derived_state(struct r600_context *rctx)
        }
 
        if (si_pm4_state_changed(rctx, ps) || si_pm4_state_changed(rctx, vs)) {
+               /* XXX: Emitting the PS state even when only the VS changed
+                * fixes random failures with piglit glsl-max-varyings.
+                * Not sure why...
+                */
+               rctx->emitted.named.ps = NULL;
                si_update_spi_map(rctx);
        }
 }