summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2019-07-29 16:56:03 -0700
committerAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2019-07-30 10:01:19 -0700
commit982134d22ec51da1c34eba7d7a3ce33a3501c906 (patch)
tree92ac53c3df89c707ac0fa33a30c97b354bbf1d64
parent79875a9a644c4c3413a34111e47c74d8fafb5da0 (diff)
downloadmesa-982134d22ec51da1c34eba7d7a3ce33a3501c906.tar.gz
pan/midgard: Compose original texture swizzle in RA
Used for lowering derivatives. Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
-rw-r--r--src/panfrost/midgard/midgard_ra.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index dfce0445b3c..60dadae945a 100644
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -833,8 +833,10 @@ install_registers_instr(
ins->texture.out_full = 1;
ins->texture.out_upper = 0;
ins->texture.out_reg_select = dest.reg - 28;
- ins->texture.swizzle = dest.swizzle;
- ins->texture.mask = dest.mask;
+ ins->texture.swizzle =
+ compose_swizzle(ins->texture.swizzle, dest.mask, dest, dest);
+ ins->mask =
+ compose_writemask(ins->mask, dest);
/* If there is a register LOD/bias, use it */
if (args.src1 > -1) {