commit 56bda0fb4947356931463833c7864998a1e96452
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Tue Nov 03 08:23:01 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Tue Nov 03 14:42:43 2020 +0000
tree c443645c353e223cd45ea3525ded00bf37987789
parent 1463824319b428f9ec8f2f227036e7508bd2deea

pan/bi: Track tex data register swizzles

So we can pass through a .z component.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7408>

src/panfrost/bifrost/bifrost_compile.c

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 442128f..0313fcf 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -1699,6 +1699,7 @@
 
         /* 32-bit indices to be allocated as consecutive data registers. */
         unsigned dregs[BIFROST_TEX_DREG_COUNT] = { 0 };
+        unsigned dregs_swiz[BIFROST_TEX_DREG_COUNT] = { 0 };
 
         for (unsigned i = 0; i < instr->num_srcs; ++i) {
                 unsigned index = pan_src_index(&instr->src[i].src);
@@ -1781,8 +1782,10 @@
         for (unsigned i = 0; i < ARRAY_SIZE(dregs); ++i) {
                 assert(dreg_index < 4);
 
-                if (dregs[i])
+                if (dregs[i]) {
+                        combine.swizzle[dreg_index][0] = dregs_swiz[i];
                         combine.src[dreg_index++] = dregs[i];
+                }
         }
 
         if (dreg_index > 1) {
@@ -1794,6 +1797,7 @@
                         tex.swizzle[0][i] = i;
         } else if (dreg_index == 1) {
                 tex.src[0] = combine.src[0];
+                tex.swizzle[0][0] = combine.swizzle[0][0];
         } else {
                 tex.src[0] = tex.dest;
         }