Mesa (master): glsl: Apply the transformation "(a && a) -> a" in opt_algebraic.

Eric Anholt anholt at kemper.freedesktop.org
Fri Nov 15 19:34:01 UTC 2013


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Oct 31 09:32:42 2013 -0700

glsl: Apply the transformation "(a && a) -> a" in opt_algebraic.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/glsl/opt_algebraic.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 3da27e5..ea3c386 100644
--- a/src/glsl/opt_algebraic.cpp
+++ b/src/glsl/opt_algebraic.cpp
@@ -357,7 +357,6 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
       break;
 
    case ir_binop_logic_and:
-      /* FINISHME: Also simplify (a && a) to (a). */
       if (is_vec_one(op_const[0])) {
 	 return ir->operands[1];
       } else if (is_vec_one(op_const[1])) {
@@ -371,6 +370,9 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
           */
          return logic_not(logic_or(op_expr[0]->operands[0],
                                    op_expr[1]->operands[0]));
+      } else if (ir->operands[0]->equals(ir->operands[1])) {
+         /* (a && a) == a */
+         return ir->operands[0];
       }
       break;
 




More information about the mesa-commit mailing list