From f1fd94f3550372a91e79c4ff6c0b09821dfb0192 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Fri, 24 Aug 2012 10:55:16 +0200 Subject: [PATCH] radeonsi: fix stupid bug added in commit 07838603b9a69c05911edbcd351bfce5ad9b5a2c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König Reviewed-by: Alex Deucher --- src/gallium/drivers/radeonsi/si_state_draw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 5f8e2118a15..75df4e84e98 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -170,13 +170,14 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s si_pm4_set_reg(pm4, R_0286E0_SPI_BARYC_CNTL, spi_baryc_cntl); spi_ps_input_ena = shader->spi_ps_input_ena; /* we need to enable at least one of them, otherwise we hang the GPU */ - if (!spi_ps_input_ena & (C_0286CC_PERSP_SAMPLE_ENA | - C_0286CC_PERSP_CENTROID_ENA | - C_0286CC_PERSP_PULL_MODEL_ENA | - C_0286CC_LINEAR_SAMPLE_ENA | - C_0286CC_LINEAR_CENTER_ENA | - C_0286CC_LINEAR_CENTROID_ENA | - C_0286CC_LINE_STIPPLE_TEX_ENA)) { + if (!G_0286CC_PERSP_SAMPLE_ENA(spi_ps_input_ena) && + !G_0286CC_PERSP_CENTROID_ENA(spi_ps_input_ena) && + !G_0286CC_PERSP_PULL_MODEL_ENA(spi_ps_input_ena) && + !G_0286CC_LINEAR_SAMPLE_ENA(spi_ps_input_ena) && + !G_0286CC_LINEAR_CENTER_ENA(spi_ps_input_ena) && + !G_0286CC_LINEAR_CENTROID_ENA(spi_ps_input_ena) && + !G_0286CC_LINE_STIPPLE_TEX_ENA(spi_ps_input_ena)) { + spi_ps_input_ena |= S_0286CC_PERSP_SAMPLE_ENA(1); } si_pm4_set_reg(pm4, R_0286CC_SPI_PS_INPUT_ENA, spi_ps_input_ena); -- 2.30.2