Mesa (master): pan/bi: Emit a combine even if we only pass one staging reg to TEXC

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: bbd3a8eaddc12b64fbd61eff954983771f07be24
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bbd3a8eaddc12b64fbd61eff954983771f07be24

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Tue Nov 17 21:48:27 2020 +0100

pan/bi: Emit a combine even if we only pass one staging reg to TEXC

We need that to account for potential swizzling on the source reg.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7615>

---

 src/panfrost/bifrost/bifrost_compile.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 7cbba974043..d072cd16da0 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -2074,16 +2074,13 @@ emit_texc(bi_context *ctx, nir_tex_instr *instr)
                 }
         }
 
-        if (dreg_index > 1) {
+        if (dreg_index >= 1) {
                 /* Pass combined data registers together */
                 tex.src[0] = combine.dest;
                 bi_emit(ctx, combine);
 
                 for (unsigned i = 0; i < dreg_index; ++i)
                         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;
         }