Further reduce overhead of applying ProgramCompiler visitors

[libs/gl.git] / source / programcompiler.cpp

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index a730f74348f072fab4edd1398835b380b4295af4..63939409fc4c7d28c6f38cc031925cacb919257f 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -58,11 +58,11 @@ void ProgramCompiler::add_shaders(Program &program)
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
        {
                if(i->type==VERTEX)
-                       program.attach_shader_owned(new VertexShader(head+create_source(*i)));
+                       program.attach_shader_owned(new VertexShader(head+apply<Formatter>(*i)));
                else if(i->type==GEOMETRY)
-                       program.attach_shader_owned(new GeometryShader(head+create_source(*i)));
+                       program.attach_shader_owned(new GeometryShader(head+apply<Formatter>(*i)));
                else if(i->type==FRAGMENT)
-                       program.attach_shader_owned(new FragmentShader(head+create_source(*i)));
+                       program.attach_shader_owned(new FragmentShader(head+apply<Formatter>(*i)));
        }
 
        program.bind_attribute(VERTEX4, "vertex");
@@ -125,14 +125,10 @@ void ProgramCompiler::generate(Stage &stage)
 
 bool ProgramCompiler::optimize(Stage &stage)
 {
-       UnusedVariableLocator unused_locator;
-       unused_locator.apply(stage);
+       set<Node *> unused = apply<UnusedVariableLocator>(stage);
+       apply<NodeRemover>(stage, unused);
 
-       NodeRemover remover;
-       remover.to_remove = unused_locator.unused_nodes;
-       remover.apply(stage);
-
-       return !unused_locator.unused_nodes.empty();
+       return !unused.empty();
 }
 
 void ProgramCompiler::inject_block(Block &target, const Block &source)
@@ -143,17 +139,19 @@ void ProgramCompiler::inject_block(Block &target, const Block &source)
 }
 
 template<typename T>
-void ProgramCompiler::apply(Stage &stage)
+typename T::ResultType ProgramCompiler::apply(Stage &stage)
 {
        T visitor;
        visitor.apply(stage);
+       return visitor.get_result();
 }
 
-string ProgramCompiler::create_source(Stage &stage)
+template<typename T, typename A>
+typename T::ResultType ProgramCompiler::apply(Stage &stage, const A &arg)
 {
-       Formatter formatter;
-       formatter.apply(stage);
-       return formatter.formatted;
+       T visitor(arg);
+       visitor.apply(stage);
+       return visitor.get_result();
 }
 
 
@@ -944,6 +942,10 @@ void ProgramCompiler::UnusedVariableLocator::visit(Iteration &iter)
 }
 
 
+ProgramCompiler::NodeRemover::NodeRemover(const set<Node *> &r):
+       to_remove(r)
+{ }
+
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {
        for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )