Mesa (master): radeonsi: don't set CB_SHADER_MASK= 1 if there are no color outputs

Marek Olšák mareko at kemper.freedesktop.org
Tue Aug 19 10:57:08 UTC 2014


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Aug 18 00:51:47 2014 +0200

radeonsi: don't set CB_SHADER_MASK=1 if there are no color outputs

This hack isn't needed anymore because of the previous u_blitter commit.

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 3fcd314..08ba8b0 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1514,10 +1514,6 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
 		last_args[6]= uint->zero;
 		last_args[7]= uint->zero;
 		last_args[8]= uint->zero;
-
-		si_shader_ctx->shader->spi_shader_col_format |=
-			V_028714_SPI_SHADER_32_ABGR;
-		si_shader_ctx->shader->cb_shader_mask |= S_02823C_OUTPUT0_ENABLE(0xf);
 	}
 
 	/* Specify whether the EXEC mask represents the valid mask */




More information about the mesa-commit mailing list