From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 2 Jun 2020 23:28:03 +0000 (-0400)
Subject: pan/bi: Fix SEL.16 swizzle
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=323eecaf1392b8fc6951e9f4967fca6ee755ec28;p=mesa.git

pan/bi: Fix SEL.16 swizzle

2 scalar arguments, not 1 vector.

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 6eb6da7699b..2d59b760c28 100644
--- a/src/panfrost/bifrost/bi_lower_combine.c
+++ b/src/panfrost/bifrost/bi_lower_combine.c
@@ -71,10 +71,10 @@ bi_combine_sel16(bi_context *ctx, bi_instruction *parent, unsigned comp, unsigne
                 .dest_offset = comp >> 1,
                 .src = { parent->src[comp], parent->src[comp + 1] },
                 .src_types = { nir_type_uint16, nir_type_uint16 },
-                .swizzle = { {
-                        parent->swizzle[comp][0],
-                        parent->swizzle[comp + 1][0],
-                } }
+                .swizzle = {
+                        { parent->swizzle[comp][0] },
+                        { parent->swizzle[comp + 1][0] },
+                }
         };
 
         /* In case we have a combine from a vec3 */