From: Rob Clark <robdclark@gmail.com>
Date: Thu, 9 Nov 2017 15:50:44 +0000 (-0500)
Subject: freedreno/ir3: correct # of dest components for intrinsics
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86154acb5722c2eecf46324c5509e963a212ba44;p=mesa.git

freedreno/ir3: correct # of dest components for intrinsics

Don't rely on intr->num_components having a valid value.  It doesn't
seem to anymore for non-vectorized intrinsics.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
index d5db8e57ffb..ef7a752014d 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
@@ -1418,7 +1418,12 @@ emit_intrinsic(struct ir3_compile *ctx, nir_intrinsic_instr *intr)
 	int idx;
 
 	if (info->has_dest) {
-		dst = get_dst(ctx, &intr->dest, intr->num_components);
+		unsigned n;
+		if (info->dest_components)
+			n = info->dest_components;
+		else
+			n = intr->num_components;
+		dst = get_dst(ctx, &intr->dest, n);
 	} else {
 		dst = NULL;
 	}