[Mesa-dev] [PATCH 5/8] radeonsi: don't apply the Z export bug workaround to Hainan

Marek Olšák maraeo at gmail.com
Wed Nov 30 01:36:36 UTC 2016


From: Marek Olšák <marek.olsak at amd.com>

not needed
---
 src/gallium/drivers/radeonsi/si_shader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index ee2fce1..44a4dd2 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2891,24 +2891,25 @@ static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base,
 		if (stencil) {
 			args[6] = stencil;
 			mask |= 0x2;
 		}
 		if (samplemask) {
 			args[7] = samplemask;
 			mask |= 0x4;
 		}
 	}
 
-	/* SI (except OLAND) has a bug that it only looks
+	/* SI (except OLAND and HAINAN) has a bug that it only looks
 	 * at the X writemask component. */
 	if (ctx->screen->b.chip_class == SI &&
-	    ctx->screen->b.family != CHIP_OLAND)
+	    ctx->screen->b.family != CHIP_OLAND &&
+	    ctx->screen->b.family != CHIP_HAINAN)
 		mask |= 0x1;
 
 	/* Specify which components to enable */
 	args[0] = lp_build_const_int32(base->gallivm, mask);
 
 	memcpy(exp->args[exp->num++], args, sizeof(args));
 }
 
 static void si_export_mrt_color(struct lp_build_tgsi_context *bld_base,
 				LLVMValueRef *color, unsigned index,
-- 
2.7.4



More information about the mesa-dev mailing list