Make ConstantConditionEliminator less trigger-happy

[libs/gl.git] / source / glsl / optimize.cpp

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 7f60e67cc9c4ff58bfd46d452d407106b30d2315..87a57eb7f82496c797c6afdcf7ddbb257049655c 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -523,15 +523,14 @@ void ConstantConditionEliminator::visit(Block &block)
 
 void ConstantConditionEliminator::visit(Conditional &cond)
 {
-       ExpressionEvaluator eval;
-       cond.condition->visit(eval);
-       if(eval.is_result_valid())
-       {
-               Block &block = (eval.get_result() ? cond.body : cond.else_body);
-               current_block->body.splice(insert_point, block.body);
-               nodes_to_remove.insert(&cond);
-               return;
-       }
+       if(Literal *literal = dynamic_cast<Literal *>(cond.condition.get()))
+               if(literal->value.check_type<bool>())
+               {
+                       Block &block = (literal->value.value<bool>() ? cond.body : cond.else_body);
+                       current_block->body.splice(insert_point, block.body);
+                       nodes_to_remove.insert(&cond);
+                       return;
+               }
 
        TraversingVisitor::visit(cond);
 }
@@ -661,7 +660,7 @@ bool UnusedVariableRemover::apply(Stage &s)
                }
                if(output)
                {
-                       if(!i->second.assignments.empty() && i->second.interface_block)
+                       if((i->second.referenced || !i->second.assignments.empty()) && i->second.interface_block)
                                used_interface_blocks.insert(i->second.interface_block);
                        continue;
                }