From a18f803a860767be3604369d865b6c0df0d15f2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 14 Oct 2014 22:51:10 +0200 Subject: [PATCH] radeonsi: revert hack for random failures in glsl-max-varyings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 032e5548b3d4b5efa52359218725cb8e31b622ad. I've run glsl-max-varyings 30 times and it always passed. Reviewed-by: Michel Dänzer --- 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 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; -- 2.30.2