From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Dec 2017 08:38:26 +0000 (+0000)
Subject: r600/ssbo: fix multi-dword buffer loads.
X-Git-Tag: upstream/18.1.0~3465
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a256506b762620d0fe7fde81ebd3756c5e14d9ec;p=platform%2Fupstream%2Fmesa.git

r600/ssbo: fix multi-dword buffer loads.

This fixes loading from different channels.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 93b86ea..02e8354 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -8005,17 +8005,19 @@ static int tgsi_load_buffer(struct r600_shader_ctx *ctx)
 	vtx.format_comp_all = 1;
 	vtx.srf_mode_all = 0;
 
-	if (inst->Dst[0].Register.WriteMask == 0xf) {
+	if (inst->Dst[0].Register.WriteMask & 8) {
 		vtx.data_format = FMT_32_32_32_32;
 		vtx.use_const_fields = 0;
-	} else if (inst->Dst[0].Register.WriteMask == 0x7) {
+	} else if (inst->Dst[0].Register.WriteMask & 4) {
 		vtx.data_format = FMT_32_32_32;
 		vtx.use_const_fields = 0;
-	} else if (inst->Dst[0].Register.WriteMask == 0x3) {
+	} else if (inst->Dst[0].Register.WriteMask & 2) {
 		vtx.data_format = FMT_32_32;
 		vtx.use_const_fields = 0;
-	} else
-		vtx.use_const_fields = 1;
+	} else {
+		vtx.data_format = FMT_32;
+		vtx.use_const_fields = 0;
+	}
 
 	r = r600_bytecode_add_vtx_tc(ctx->bc, &vtx);
 	if (r)