Mesa (master): v3d: Fix an invalid reuse of flags generation from before a thrsw.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr 17 14:07:20 2019 -0700

v3d: Fix an invalid reuse of flags generation from before a thrsw.

Noticed while debugging the last GLES 3.1 failure, though it doesn't seem
to affect that bug.

---

 src/broadcom/compiler/vir_opt_redundant_flags.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/broadcom/compiler/vir_opt_redundant_flags.c b/src/broadcom/compiler/vir_opt_redundant_flags.c
index b61514f6c99..61ebf5dfa24 100644
--- a/src/broadcom/compiler/vir_opt_redundant_flags.c
+++ b/src/broadcom/compiler/vir_opt_redundant_flags.c
@@ -107,6 +107,10 @@ vir_opt_redundant_flags_block(struct v3d_compile *c, struct qblock *block)
                         continue;
                 }
 
+                /* Flags aren't preserved across a thrsw. */
+                if (inst->qpu.sig.thrsw)
+                        last_flags = NULL;
+
                 if (inst->qpu.flags.apf != V3D_QPU_PF_NONE ||
                     inst->qpu.flags.mpf != V3D_QPU_PF_NONE) {
                         if (last_flags &&