Mesa (master): pan/midgard: Handle nontrivial masks in texture RA

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Wed Oct 16 13:01:41 2019 -0400

pan/midgard: Handle nontrivial masks in texture RA

The texture instruction has a mask we need to take into account.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>

---

 src/panfrost/midgard/midgard_ra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index 51687defccb..f8355a89720 100644
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -823,7 +823,7 @@ install_registers_instr(
                 ins->texture.in_reg_upper = 0;
                 ins->texture.in_reg_select = coord.reg - 28;
                 ins->texture.in_reg_swizzle =
-                        compose_swizzle(ins->texture.in_reg_swizzle, 0xF, coord, dest);
+                        pan_compose_swizzle(ins->texture.in_reg_swizzle, coord.swizzle);
 
                 /* Next, install the destination */
                 ins->texture.out_full = 1;