throw invalid_operation("ProgramCompiler::add_shaders");
string head = "#version 150\n";
- if(module->vertex_stage.present)
- program.attach_shader_owned(new VertexShader(head+format_stage(module->vertex_stage)));
- if(module->geometry_stage.present)
- program.attach_shader_owned(new GeometryShader(head+format_stage(module->geometry_stage)));
- if(module->fragment_stage.present)
- program.attach_shader_owned(new FragmentShader(head+format_stage(module->fragment_stage)));
+ 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)));
+ else if(i->type==GEOMETRY)
+ program.attach_shader_owned(new GeometryShader(head+create_source(*i)));
+ else if(i->type==FRAGMENT)
+ program.attach_shader_owned(new FragmentShader(head+create_source(*i)));
+ }
program.bind_attribute(VERTEX4, "vertex");
program.bind_attribute(NORMAL3, "normal");
void ProgramCompiler::process()
{
- if(module->vertex_stage.present)
- generate(module->vertex_stage);
- if(module->geometry_stage.present)
- generate(module->geometry_stage);
- if(module->fragment_stage.present)
- generate(module->fragment_stage);
-
- if(module->vertex_stage.present)
- optimize(module->vertex_stage);
- if(module->geometry_stage.present)
- optimize(module->geometry_stage);
- if(module->fragment_stage.present)
- optimize(module->fragment_stage);
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ generate(*i);
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ optimize(*i);
}
void ProgramCompiler::generate(Stage &stage)
{
inject_block(stage.content, module->shared.content);
- resolve_variables(stage);
-
- InterfaceGenerator generator;
- generator.visit(stage);
-
- resolve_variables(stage);
-
- VariableRenamer renamer;
- stage.content.visit(renamer);
+ apply<VariableResolver>(stage);
+ apply<InterfaceGenerator>(stage);
+ apply<VariableResolver>(stage);
+ apply<VariableRenamer>(stage);
}
void ProgramCompiler::optimize(Stage &stage)
while(1)
{
UnusedVariableLocator unused_locator;
- unused_locator.visit(stage);
+ unused_locator.apply(stage);
NodeRemover remover;
remover.to_remove = unused_locator.unused_nodes;
- remover.visit(stage);
+ remover.apply(stage);
if(!remover.n_removed)
break;
target.body.insert(insert_point, (*i)->clone());
}
-void ProgramCompiler::resolve_variables(Stage &stage)
+template<typename T>
+void ProgramCompiler::apply(Stage &stage)
{
- VariableResolver resolver;
- stage.content.visit(resolver);
+ T visitor;
+ visitor.apply(stage);
}
-string ProgramCompiler::format_stage(Stage &stage)
+string ProgramCompiler::create_source(Stage &stage)
{
Formatter formatter;
- stage.content.visit(formatter);
+ formatter.apply(stage);
return formatter.formatted;
}
+ProgramCompiler::Visitor::Visitor():
+ stage(0)
+{ }
+
+void ProgramCompiler::Visitor::apply(Stage &s)
+{
+ SetForScope<Stage *> set(stage, &s);
+ stage->content.visit(*this);
+}
+
+
ProgramCompiler::Formatter::Formatter():
indent(0),
parameter_list(false),
ProgramCompiler::InterfaceGenerator::InterfaceGenerator():
- stage(0),
scope_level(0),
remove_node(false)
{ }
return string();
}
-void ProgramCompiler::InterfaceGenerator::visit(Stage &s)
+void ProgramCompiler::InterfaceGenerator::apply(Stage &s)
{
SetForScope<Stage *> set(stage, &s);
if(stage->previous)
if(scope_level==1)
{
- for(map<string, NodePtr<Node> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
+ for(map<string, Node *>::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
{
list<NodePtr<Node> >::iterator k = block.body.insert(i, j->second);
(*k)->visit(*this);
iface_declarations.clear();
}
- for(list<NodePtr<Node> >::iterator j=insert_nodes.begin(); j!=insert_nodes.end(); ++j)
+ for(list<Node *>::iterator j=insert_nodes.begin(); j!=insert_nodes.end(); ++j)
block.body.insert(i, *j);
insert_nodes.clear();
iface_var->array_size = out.array_size;
if(iface=="in")
iface_var->linked_declaration = &out;
- iface_declarations[iface_var->name] = iface_var;
+ iface_declarations[name] = iface_var;
return true;
}
ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
- stage(0),
assignment(false),
assignment_target(0)
{ }
-void ProgramCompiler::UnusedVariableLocator::visit(Stage &s)
-{
- stage = &s;
- stage->content.visit(*this);
-}
-
void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
{
if(assignment)
unused_nodes.erase(var.declaration);
map<VariableDeclaration *, Node *>::iterator i = assignments.find(var.declaration);
if(i!=assignments.end())
+ {
unused_nodes.erase(i->second);
+ assignments.erase(i);
+ }
}
}
TraversingVisitor::visit(expr);
if(assignment && assignment_target)
{
+ Node *&assign = assignments[assignment_target];
+ if(assign)
+ unused_nodes.insert(assign);
+ assign = &expr;
if(assignment_target->interface!="out" || (stage->type!=FRAGMENT && !assignment_target->linked_declaration))
- {
unused_nodes.insert(&expr);
- assignments[assignment_target] = &expr;
- }
else
unused_nodes.erase(assignment_target);
}
ProgramCompiler::NodeRemover::NodeRemover():
- stage(0),
n_removed(0),
immutable_block(false),
remove_block(false)
{ }
-void ProgramCompiler::NodeRemover::visit(Stage &s)
-{
- stage = &s;
- stage->content.visit(*this);
-}
-
void ProgramCompiler::NodeRemover::visit(Block &block)
{
remove_block = immutable_block;