mesa: fix packing of float texels to GL_SHORT/GL_BYTE

[mesa.git] / src / glsl / opt_if_simplification.cpp

diff --git a/src/glsl/opt_if_simplification.cpp b/src/glsl/opt_if_simplification.cpp
index 940dd08d5768353480821265d6bc906ca9fc5e84..2bec8252ea510d67077a8caeb803a3c2d34929f4 100644 (file)
--- a/src/glsl/opt_if_simplification.cpp
+++ b/src/glsl/opt_if_simplification.cpp
@@ -25,11 +25,14 @@
  * \file opt_if_simplification.cpp
  *
  * Moves constant branches of if statements out to the surrounding
- * instruction stream.
+ * instruction stream, and inverts if conditionals to avoid empty
+ * "then" blocks.
  */
 
 #include "ir.h"
 
+namespace {
+
 class ir_if_simplification_visitor : public ir_hierarchical_visitor {
 public:
    ir_if_simplification_visitor()
@@ -43,6 +46,8 @@ public:
    bool made_progress;
 };
 
+} /* unnamed namespace */
+
 /* We only care about the top level "if" instructions, so don't
  * descend into expressions.
  */
@@ -66,6 +71,14 @@ do_if_simplification(exec_list *instructions)
 ir_visitor_status
 ir_if_simplification_visitor::visit_leave(ir_if *ir)
 {
+   /* If the if statement has nothing on either side, remove it. */
+   if (ir->then_instructions.is_empty() &&
+       ir->else_instructions.is_empty()) {
+      ir->remove();
+      this->made_progress = true;
+      return visit_continue;
+   }
+
    /* FINISHME: Ideally there would be a way to note that the condition results
     * FINISHME: in a constant before processing both of the other subtrees.
     * FINISHME: This can probably be done with some flags, but it would take
@@ -77,18 +90,42 @@ ir_if_simplification_visitor::visit_leave(ir_if *ir)
        * that matters out.
        */
       if (condition_constant->value.b[0]) {
-        foreach_iter(exec_list_iterator, then_iter, ir->then_instructions) {
-           ir_instruction *then_ir = (ir_instruction *)then_iter.get();
+        foreach_list_safe(n, &ir->then_instructions) {
+           ir_instruction *then_ir = (ir_instruction *) n;
            ir->insert_before(then_ir);
         }
       } else {
-        foreach_iter(exec_list_iterator, else_iter, ir->else_instructions) {
-           ir_instruction *else_ir = (ir_instruction *)else_iter.get();
+        foreach_list_safe(n, &ir->else_instructions) {
+           ir_instruction *else_ir = (ir_instruction *) n;
            ir->insert_before(else_ir);
         }
       }
       ir->remove();
       this->made_progress = true;
+      return visit_continue;
+   }
+
+   /* Turn:
+    *
+    *     if (cond) {
+    *     } else {
+    *         do_work();
+    *     }
+    *
+    * into :
+    *
+    *     if (!cond)
+    *         do_work();
+    *
+    * which avoids control flow for "else" (which is usually more
+    * expensive than normal operations), and the "not" can usually be
+    * folded into the generation of "cond" anyway.
+    */
+   if (ir->then_instructions.is_empty()) {
+      ir->condition = new(ralloc_parent(ir->condition))
+        ir_expression(ir_unop_logic_not, ir->condition);
+      ir->else_instructions.move_nodes_to(&ir->then_instructions);
+      this->made_progress = true;
    }
 
    return visit_continue;