From b9e33c789790c2dc0fd30231970b709c94fc8264 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Sun, 29 Mar 2026 02:10:52 -0400
Subject: [PATCH] pan/bi: Stop lowering swizzles on mkvec and swz

The new lowering can handle all the swizzle cases and is generally
better at it than swizzle lowering.

Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40720>
---
 src/panfrost/compiler/bifrost/bi_lower_swizzle.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/panfrost/compiler/bifrost/bi_lower_swizzle.c b/src/panfrost/compiler/bifrost/bi_lower_swizzle.c
index f99a645104a..d7e92803ba7 100644
--- a/src/panfrost/compiler/bifrost/bi_lower_swizzle.c
+++ b/src/panfrost/compiler/bifrost/bi_lower_swizzle.c
@@ -224,6 +224,13 @@ void
 bi_lower_swizzle(bi_context *ctx)
 {
    bi_foreach_instr_global_safe(ctx, ins) {
+      /* bi_lower_mkvec_swz takes care of these and can handle any swizzle */
+      if (ins->op == BI_OPCODE_MKVEC_V2I16 ||
+          ins->op == BI_OPCODE_MKVEC_V4I8 ||
+          ins->op == BI_OPCODE_SWZ_V2I16 ||
+          ins->op == BI_OPCODE_SWZ_V4I8)
+         continue;
+
       bi_foreach_src(ins, s) {
          if (bi_is_null(ins->src[s]))
             continue;