Rearrange secondary operations in GLSL compiler

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

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index c76cae1b50f34a69ade9d31ead0c563250d24ae6..7bbe14da382b6dbd54fb23ce113187f7e8616de3 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -43,10 +43,11 @@ FunctionInliner::FunctionInliner():
        extract_result(0)
 { }
 
-FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
-       inlineable(in),
-       extract_result(0)
-{ }
+void FunctionInliner::apply(Stage &stage)
+{
+       inlineable = InlineableFunctionLocator().apply(stage);
+       visit(stage.content);
+}
 
 void FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
 {
@@ -202,14 +203,14 @@ 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),
@@ -217,14 +218,14 @@ UnusedVariableLocator::UnusedVariableLocator():
        global_scope(true)
 { }
 
-const set<Node *> &UnusedVariableLocator::apply(Stage &s)
+bool UnusedVariableRemover::apply(Stage &stage)
 {
        variables.push_back(BlockVariableMap());
-       visit(s.content);
+       visit(stage.content);
        BlockVariableMap &global_variables = variables.back();
        for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
        {
-               if(i->first->interface=="out" && (s.type==Stage::FRAGMENT || i->first->linked_declaration || !i->first->name.compare(0, 3, "gl_")))
+               if(i->first->interface=="out" && (stage.type==Stage::FRAGMENT || i->first->linked_declaration || !i->first->name.compare(0, 3, "gl_")))
                        continue;
                if(!i->second.referenced)
                {
@@ -234,10 +235,12 @@ const set<Node *> &UnusedVariableLocator::apply(Stage &s)
        }
        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())
@@ -251,13 +254,13 @@ void UnusedVariableLocator::visit(VariableReference &var)
        }
 }
 
-void UnusedVariableLocator::visit(MemberAccess &memacc)
+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=="[")
        {
@@ -271,7 +274,7 @@ void UnusedVariableLocator::visit(BinaryExpression &binary)
                TraversingVisitor::visit(binary);
 }
 
-void UnusedVariableLocator::visit(Assignment &assign)
+void UnusedVariableRemover::visit(Assignment &assign)
 {
        {
                assign_to_subscript = false;
@@ -282,7 +285,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)
@@ -291,7 +294,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)
        {
@@ -301,7 +304,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);
@@ -309,14 +312,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;
@@ -330,14 +333,14 @@ 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());
 
@@ -356,7 +359,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();
@@ -385,7 +388,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());
@@ -418,7 +421,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);
@@ -432,7 +435,14 @@ void UnusedVariableLocator::visit(Iteration &iter)
 }
 
 
-void UnusedFunctionLocator::visit(FunctionCall &call)
+bool UnusedFunctionRemover::apply(Stage &stage)
+{
+       visit(stage.content);
+       NodeRemover().apply(stage, unused_nodes);
+       return !unused_nodes.empty();
+}
+
+void UnusedFunctionRemover::visit(FunctionCall &call)
 {
        TraversingVisitor::visit(call);
 
@@ -441,7 +451,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);