Mesa (master): vc4: Don't try to CSE color reads.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jun 23 18:08:49 2015 -0700

vc4: Don't try to CSE color reads.

It returns a new value for each sample in the TLB.  We've already avoided
trying to get the same index's color multiple times at the vc4_program.c
level, so we're not losing anything by doing this.

---

 src/gallium/drivers/vc4/vc4_opt_cse.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_opt_cse.c b/src/gallium/drivers/vc4/vc4_opt_cse.c
index 92c8260..51a5650 100644
--- a/src/gallium/drivers/vc4/vc4_opt_cse.c
+++ b/src/gallium/drivers/vc4/vc4_opt_cse.c
@@ -130,7 +130,8 @@ qir_opt_cse(struct vc4_compile *c)
 
         list_for_each_entry(struct qinst, inst, &c->instructions, link) {
                 if (qir_has_side_effects(c, inst) ||
-                    qir_has_side_effect_reads(c, inst)) {
+                    qir_has_side_effect_reads(c, inst) ||
+                    inst->op == QOP_TLB_COLOR_READ) {
                         continue;
                 }