From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 25 Jun 2019 10:16:39 +0000 (+0200)
Subject: radv/gfx10: fix PS exports for SPI_SHADER_32_AR
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c31f3dcc021a4e317f35f29442742320b86cd20;p=mesa.git

radv/gfx10: fix PS exports for SPI_SHADER_32_AR

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index bf5571f30c7..84ab586caac 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -2596,9 +2596,15 @@ si_llvm_init_export_args(struct radv_shader_context *ctx,
 			break;
 
 		case V_028714_SPI_SHADER_32_AR:
-			args->enabled_channels = 0x9;
-			args->out[0] = values[0];
-			args->out[3] = values[3];
+			if (ctx->ac.chip_class >= GFX10) {
+				args->enabled_channels = 0x3;
+				args->out[0] = values[0];
+				args->out[1] = values[3];
+			} else {
+				args->enabled_channels = 0x9;
+				args->out[0] = values[0];
+				args->out[3] = values[3];
+			}
 			break;
 
 		case V_028714_SPI_SHADER_FP16_ABGR: