commit 8fcc23bf28d2c533151465bdf1d1d0cecb59b8fc
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Mon May 04 14:13:29 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Mon May 04 18:45:15 2020 +0000
tree 0b078a37d69fa1f0733d284b796089dbaa49520c
parent 36e4ffa382f9f82ff6d7ed1dd4fc66010ed48fea

pan/bit: Factor out identity swizzle helper

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

src/panfrost/bifrost/test/bi_test_pack.c

diff --git a/src/panfrost/bifrost/test/bi_test_pack.c b/src/panfrost/bifrost/test/bi_test_pack.c
index 2f02db1..832edda 100644
--- a/src/panfrost/bifrost/test/bi_test_pack.c
+++ b/src/panfrost/bifrost/test/bi_test_pack.c
@@ -517,19 +517,23 @@
 }
 
 static void
+bit_swizzle_identity(bi_instruction *ins, unsigned args, unsigned size)
+{
+        for (unsigned i = 0; i < 2; ++i) {
+                for (unsigned j = 0; j < (32 / size); ++j)
+                        ins->swizzle[i][j] = j;
+        }
+}
+
+static void
 bit_bitwise_helper(struct panfrost_device *dev, uint32_t *input, unsigned size, enum bit_debug debug)
 {
         bi_instruction ins = bit_ins(BI_BITWISE, 3, nir_type_uint, size);
+        bit_swizzle_identity(&ins, 2, size);
 
         /* TODO: shifts */
         ins.src[2] = BIR_INDEX_ZERO;
 
-        /* Force identity swizzle -- bitwise is not swizzleable */
-        for (unsigned i = 0; i < 2; ++i) {
-                for (unsigned j = 0; j < (32 / size); ++j)
-                        ins.swizzle[i][j] = j;
-        }
-
         for (unsigned op = BI_BITWISE_AND; op <= BI_BITWISE_XOR; ++op) {
                 ins.op.bitwise = op;