From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 25 May 2019 02:49:27 +0000 (-0400)
Subject: radeonsi/gfx10: fix PS exports for SPI_SHADER_32_AR
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f715790641fef2c54d979dd84e92d8236bddebb;p=mesa.git

radeonsi/gfx10: fix PS exports for SPI_SHADER_32_AR

Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 6f11225c9af..2d022438841 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2450,9 +2450,15 @@ static void si_llvm_init_export_args(struct si_shader_context *ctx,
 		break;
 
 	case V_028714_SPI_SHADER_32_AR:
-		args->enabled_channels = 0x9; /* writemask */
-		args->out[0] = values[0];
-		args->out[3] = values[3];
+		if (ctx->screen->info.chip_class >= GFX10) {
+			args->enabled_channels = 0x3; /* writemask */
+			args->out[0] = values[0];
+			args->out[1] = values[3];
+		} else {
+			args->enabled_channels = 0x9; /* writemask */
+			args->out[0] = values[0];
+			args->out[3] = values[3];
+		}
 		break;
 
 	case V_028714_SPI_SHADER_FP16_ABGR: