Improve support for interface blocks

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

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index dfb17b26799bc2845d063ad9618356f2f80be8d9..1ebb87c5c2ea23360c33917104745273de6d8da0 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -39,11 +39,16 @@ void InlineableFunctionLocator::visit(FunctionDeclaration &func)
 }
 
 
-FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
-       inlineable(in),
+FunctionInliner::FunctionInliner():
        extract_result(0)
 { }
 
+void FunctionInliner::apply(Stage &stage)
+{
+       inlineable = InlineableFunctionLocator().apply(stage);
+       stage.content.visit(*this);
+}
+
 void FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
 {
        inline_result = 0;
@@ -119,14 +124,23 @@ void FunctionInliner::visit(Return &ret)
 
 
 ConstantConditionEliminator::ConstantConditionEliminator():
-       scope_level(0),
        record_only(false)
 { }
 
+void ConstantConditionEliminator::apply(Stage &stage)
+{
+       stage.content.visit(*this);
+       NodeRemover().apply(stage, nodes_to_remove);
+}
+
 void ConstantConditionEliminator::visit(Block &block)
 {
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       BlockModifier::visit(block);
+       SetForScope<Block *> set_block(current_block, &block);
+       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+       {
+               insert_point = i;
+               (*i)->visit(*this);
+       }
 
        for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
                variable_values.erase(i->second);
@@ -146,7 +160,7 @@ void ConstantConditionEliminator::visit(Assignment &assign)
 
 void ConstantConditionEliminator::visit(VariableDeclaration &var)
 {
-       if(var.constant || scope_level>1)
+       if((var.constant || current_block->parent) && var.init_expression)
                variable_values[&var] = var.init_expression.get();
 }
 
@@ -158,7 +172,9 @@ void ConstantConditionEliminator::visit(Conditional &cond)
                cond.condition->visit(eval);
                if(eval.is_result_valid())
                {
-                       flatten_block(eval.get_result() ? cond.body : cond.else_body);
+                       Block &block = (eval.get_result() ? cond.body : cond.else_body);
+                       current_block->body.splice(insert_point, block.body);
+                       nodes_to_remove.insert(&cond);
                        return;
                }
        }
@@ -180,7 +196,7 @@ void ConstantConditionEliminator::visit(Iteration &iter)
                        iter.condition->visit(eval);
                        if(eval.is_result_valid() && !eval.get_result())
                        {
-                               remove_node = true;
+                               nodes_to_remove.insert(&iter);
                                return;
                        }
                }
@@ -198,25 +214,24 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 }
 
 
-UnusedVariableLocator::VariableInfo::VariableInfo():
+UnusedVariableRemover::VariableInfo::VariableInfo():
        local(false),
        conditionally_assigned(false),
        referenced(false)
 { }
 
 
-UnusedVariableLocator::UnusedVariableLocator():
+UnusedVariableRemover::UnusedVariableRemover():
        aggregate(0),
        assignment(0),
        assignment_target(false),
-       assign_to_subscript(false),
-       global_scope(true)
+       assign_to_subscript(false)
 { }
 
-const set<Node *> &UnusedVariableRemover::apply(Stage &stage)
+bool UnusedVariableRemover::apply(Stage &stage)
 {
        variables.push_back(BlockVariableMap());
-       visit(stage.content);
+       stage.content.visit(*this);
        BlockVariableMap &global_variables = variables.back();
        for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
        {
@@ -230,10 +245,12 @@ const set<Node *> &UnusedVariableRemover::apply(Stage &stage)
        }
        variables.pop_back();
 
-       return unused_nodes;
+       NodeRemover().apply(stage, unused_nodes);
+
+       return !unused_nodes.empty();
 }
 
-void UnusedVariableLocator::visit(VariableReference &var)
+void UnusedVariableRemover::visit(VariableReference &var)
 {
        map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
        if(i!=aggregates.end())
@@ -247,13 +264,18 @@ void UnusedVariableLocator::visit(VariableReference &var)
        }
 }
 
-void UnusedVariableLocator::visit(MemberAccess &memacc)
+void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
+{
+       unused_nodes.erase(iface.declaration);
+}
+
+void UnusedVariableRemover::visit(MemberAccess &memacc)
 {
        TraversingVisitor::visit(memacc);
        unused_nodes.erase(memacc.declaration);
 }
 
-void UnusedVariableLocator::visit(BinaryExpression &binary)
+void UnusedVariableRemover::visit(BinaryExpression &binary)
 {
        if(binary.oper=="[")
        {
@@ -267,7 +289,7 @@ void UnusedVariableLocator::visit(BinaryExpression &binary)
                TraversingVisitor::visit(binary);
 }
 
-void UnusedVariableLocator::visit(Assignment &assign)
+void UnusedVariableRemover::visit(Assignment &assign)
 {
        {
                assign_to_subscript = false;
@@ -278,7 +300,7 @@ void UnusedVariableLocator::visit(Assignment &assign)
        assignment = &assign;
 }
 
-void UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool chained)
+void UnusedVariableRemover::record_assignment(VariableDeclaration &var, Node &node, bool chained)
 {
        VariableInfo &var_info = variables.back()[&var];
        if(!chained)
@@ -287,7 +309,7 @@ void UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &no
        var_info.conditionally_assigned = false;
 }
 
-void UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_unused)
+void UnusedVariableRemover::clear_assignments(VariableInfo &var_info, bool mark_unused)
 {
        if(mark_unused)
        {
@@ -297,7 +319,7 @@ void UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_
        var_info.assignments.clear();
 }
 
-void UnusedVariableLocator::visit(ExpressionStatement &expr)
+void UnusedVariableRemover::visit(ExpressionStatement &expr)
 {
        assignment = 0;
        TraversingVisitor::visit(expr);
@@ -305,14 +327,14 @@ void UnusedVariableLocator::visit(ExpressionStatement &expr)
                record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript));
 }
 
-void UnusedVariableLocator::visit(StructDeclaration &strct)
+void UnusedVariableRemover::visit(StructDeclaration &strct)
 {
        SetForScope<Node *> set(aggregate, &strct);
        unused_nodes.insert(&strct);
        TraversingVisitor::visit(strct);
 }
 
-void UnusedVariableLocator::visit(VariableDeclaration &var)
+void UnusedVariableRemover::visit(VariableDeclaration &var)
 {
        if(aggregate)
                aggregates[&var] = aggregate;
@@ -326,23 +348,20 @@ void UnusedVariableLocator::visit(VariableDeclaration &var)
        TraversingVisitor::visit(var);
 }
 
-void UnusedVariableLocator::visit(InterfaceBlock &iface)
+void UnusedVariableRemover::visit(InterfaceBlock &iface)
 {
        SetForScope<Node *> set(aggregate, &iface);
        unused_nodes.insert(&iface);
        TraversingVisitor::visit(iface);
 }
 
-void UnusedVariableLocator::visit(FunctionDeclaration &func)
+void UnusedVariableRemover::visit(FunctionDeclaration &func)
 {
        variables.push_back(BlockVariableMap());
 
-       {
-               SetForScope<bool> set(global_scope, false);
-               for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
-                       (*i)->visit(*this);
-               func.body.visit(*this);
-       }
+       for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+               (*i)->visit(*this);
+       func.body.visit(*this);
 
        BlockVariableMap &block_variables = variables.back();
        for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
@@ -352,7 +371,7 @@ void UnusedVariableLocator::visit(FunctionDeclaration &func)
        merge_down_variables();
 }
 
-void UnusedVariableLocator::merge_down_variables()
+void UnusedVariableRemover::merge_down_variables()
 {
        BlockVariableMap &parent_variables = variables[variables.size()-2];
        BlockVariableMap &block_variables = variables.back();
@@ -381,7 +400,7 @@ void UnusedVariableLocator::merge_down_variables()
        variables.pop_back();
 }
 
-void UnusedVariableLocator::visit(Conditional &cond)
+void UnusedVariableRemover::visit(Conditional &cond)
 {
        cond.condition->visit(*this);
        variables.push_back(BlockVariableMap());
@@ -414,7 +433,7 @@ void UnusedVariableLocator::visit(Conditional &cond)
        merge_down_variables();
 }
 
-void UnusedVariableLocator::visit(Iteration &iter)
+void UnusedVariableRemover::visit(Iteration &iter)
 {
        variables.push_back(BlockVariableMap());
        TraversingVisitor::visit(iter);
@@ -428,7 +447,14 @@ void UnusedVariableLocator::visit(Iteration &iter)
 }
 
 
-void UnusedFunctionLocator::visit(FunctionCall &call)
+bool UnusedFunctionRemover::apply(Stage &stage)
+{
+       stage.content.visit(*this);
+       NodeRemover().apply(stage, unused_nodes);
+       return !unused_nodes.empty();
+}
+
+void UnusedFunctionRemover::visit(FunctionCall &call)
 {
        TraversingVisitor::visit(call);
 
@@ -437,7 +463,7 @@ void UnusedFunctionLocator::visit(FunctionCall &call)
                used_definitions.insert(call.declaration->definition);
 }
 
-void UnusedFunctionLocator::visit(FunctionDeclaration &func)
+void UnusedFunctionRemover::visit(FunctionDeclaration &func)
 {
        TraversingVisitor::visit(func);