Mesa (master): pan/midgard: Don't try to propagate swizzles to branches

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Tue Oct 15 16:10:08 2019 -0400

pan/midgard: Don't try to propagate swizzles to branches

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

---

 src/panfrost/midgard/midgard_opt_copy_prop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/midgard/midgard_opt_copy_prop.c b/src/panfrost/midgard/midgard_opt_copy_prop.c
index 8f6ff2ac7db..ad3a96d3c5d 100644
--- a/src/panfrost/midgard/midgard_opt_copy_prop.c
+++ b/src/panfrost/midgard/midgard_opt_copy_prop.c
@@ -62,9 +62,9 @@ midgard_opt_copy_prop(compiler_context *ctx, midgard_block *block)
                 mir_foreach_instr_global(ctx, q) {
                         bool is_tex = q->type == TAG_TEXTURE_4;
                         bool is_ldst = q->type == TAG_LOAD_STORE_4;
-                        bool is_writeout = q->compact_branch && q->writeout;
+                        bool is_branch = q->compact_branch;
 
-                        if (!(is_tex || is_ldst || is_writeout)) continue;
+                        if (!(is_tex || is_ldst || is_branch)) continue;
 
                         /* For textures, we get one real swizzle. For stores,
                          * we also get one. For loads, we get none. */