From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 2 Jun 2020 23:27:47 +0000 (-0400)
Subject: pan/bi: Handle SEL with vec3 16-bit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9ed1ae4724ce5eeedf56d65c5427d2788a54d1e4;p=mesa.git

pan/bi: Handle SEL with vec3 16-bit

Otherwise we end up with a missing argument.

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

diff --git a/src/panfrost/bifrost/bi_lower_combine.c b/src/panfrost/bifrost/bi_lower_combine.c
index c2d9c51ffef..6eb6da7699b 100644
--- a/src/panfrost/bifrost/bi_lower_combine.c
+++ b/src/panfrost/bifrost/bi_lower_combine.c
@@ -77,6 +77,10 @@ bi_combine_sel16(bi_context *ctx, bi_instruction *parent, unsigned comp, unsigne
                 } }
         };
 
+        /* In case we have a combine from a vec3 */
+        if (!sel.src[1])
+                sel.src[1] = BIR_INDEX_ZERO;
+
         bi_emit_before(ctx, parent, sel);
 }