From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 15 Apr 2020 00:20:16 +0000 (-0400)
Subject: pan/bi: Fix vec2/3 handling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=438e445e17864e91704c5c8a6ed33bfefe329008;p=mesa.git

pan/bi: Fix vec2/3 handling

Otherwise we get moves from null.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4615>
---

diff --git a/src/panfrost/bifrost/bi_lower_combine.c b/src/panfrost/bifrost/bi_lower_combine.c
index 350f4a1cce0..4a01cfcca5e 100644
--- a/src/panfrost/bifrost/bi_lower_combine.c
+++ b/src/panfrost/bifrost/bi_lower_combine.c
@@ -231,6 +231,10 @@ bi_lower_combine(bi_context *ctx, bi_block *block)
                 unsigned R = bi_make_temp_reg(ctx);
 
                 bi_foreach_src(ins, s) {
+                        /* We're done early for vec2/3 */
+                        if (!ins->src[s])
+                                continue;
+
                         unsigned vec_count = 0;
 
                         if (bi_lower_combine_src(ctx, ins, s, R, &vec_count)) {