{
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);
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+ {
+ if(optimize(*i))
+ i = module->stages.begin();
+ else
+ ++i;
+ }
}
void ProgramCompiler::generate(Stage &stage)
apply<VariableRenamer>(stage);
}
-void ProgramCompiler::optimize(Stage &stage)
+bool ProgramCompiler::optimize(Stage &stage)
{
- while(1)
- {
- UnusedVariableLocator unused_locator;
- unused_locator.apply(stage);
+ UnusedVariableLocator unused_locator;
+ unused_locator.apply(stage);
- NodeRemover remover;
- remover.to_remove = unused_locator.unused_nodes;
- remover.apply(stage);
+ NodeRemover remover;
+ remover.to_remove = unused_locator.unused_nodes;
+ remover.apply(stage);
- if(!remover.n_removed)
- break;
- }
+ return !unused_locator.unused_nodes.empty();
}
void ProgramCompiler::inject_block(Block &target, const Block &source)
if(scope_level==1)
{
- for(map<string, Node *>::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
+ for(map<string, VariableDeclaration *>::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
{
list<NodePtr<Node> >::iterator k = block.body.insert(i, j->second);
(*k)->visit(*this);
return prefix+name.substr(offset);
}
-bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration &out, const string &iface, const string &name)
+bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
{
const map<string, VariableDeclaration *> &stage_vars = (iface=="in" ? stage->in_variables : stage->out_variables);
if(stage_vars.count(name) || iface_declarations.count(name))
return false;
VariableDeclaration* iface_var = new VariableDeclaration;
- iface_var->sampling = out.sampling;
+ iface_var->sampling = var.sampling;
iface_var->interface = iface;
- iface_var->type = out.type;
- iface_var->type_declaration = out.type_declaration;
+ iface_var->type = var.type;
+ iface_var->type_declaration = var.type_declaration;
iface_var->name = name;
- iface_var->array = (out.array || (stage->type==GEOMETRY && iface=="in"));
- iface_var->array_size = out.array_size;
+ iface_var->array = (var.array || (stage->type==GEOMETRY && iface=="in"));
+ iface_var->array_size = var.array_size;
if(iface=="in")
- iface_var->linked_declaration = &out;
+ iface_var->linked_declaration = &var;
iface_declarations[name] = iface_var;
return true;
void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
{
+ vector<VariableDeclaration *> pass_vars;
+
+ for(map<string, VariableDeclaration *>::const_iterator i=stage->in_variables.begin(); i!=stage->in_variables.end(); ++i)
+ pass_vars.push_back(i->second);
+ for(map<string, VariableDeclaration *>::const_iterator i=iface_declarations.begin(); i!=iface_declarations.end(); ++i)
+ if(i->second->interface=="in")
+ pass_vars.push_back(i->second);
+
if(stage->previous)
{
const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
for(map<string, VariableDeclaration *>::const_iterator i=prev_out.begin(); i!=prev_out.end(); ++i)
{
- string out_name = change_prefix(i->second->name, out_prefix);
- generate_interface(*i->second, "in", i->second->name);
- generate_interface(*i->second, "out", out_name);
+ bool linked = false;
+ for(vector<VariableDeclaration *>::const_iterator j=pass_vars.begin(); (!linked && j!=pass_vars.end()); ++j)
+ linked = ((*j)->linked_declaration==i->second);
- VariableReference *ref = new VariableReference;
- ref->name = i->first;
- if(pass.subscript)
- {
- BinaryExpression *subscript = new BinaryExpression;
- subscript->left = ref;
- subscript->oper = "[";
- subscript->right = pass.subscript;
- subscript->after = "]";
- insert_assignment(out_name, subscript);
- }
- else
- insert_assignment(out_name, ref);
+ if(!linked && generate_interface(*i->second, "in", i->second->name))
+ pass_vars.push_back(i->second);
+ }
+ }
+
+ for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
+ {
+ string out_name = change_prefix((*i)->name, out_prefix);
+ generate_interface(**i, "out", out_name);
+
+ VariableReference *ref = new VariableReference;
+ ref->name = (*i)->name;
+ if(pass.subscript)
+ {
+ BinaryExpression *subscript = new BinaryExpression;
+ subscript->left = ref;
+ subscript->oper = "[";
+ subscript->right = pass.subscript;
+ subscript->after = "]";
+ insert_assignment(out_name, subscript);
}
+ else
+ insert_assignment(out_name, ref);
}
remove_node = true;
ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
+ aggregate(0),
assignment(false),
- assignment_target(0)
+ record_target(false),
+ assignment_target(0),
+ indeterminate_target(false),
+ self_referencing(false)
{ }
void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
{
- if(assignment)
- assignment_target = var.declaration;
+ if(record_target)
+ {
+ if(assignment_target)
+ indeterminate_target = true;
+ else
+ assignment_target = var.declaration;
+ }
else
{
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);
+ }
+
+ if(assignment && var.declaration==assignment_target)
+ self_referencing = true;
}
+
+ map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
+ if(i!=aggregates.end())
+ unused_nodes.erase(i->second);
}
void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
{
if(binary.assignment)
{
- binary.right->visit(*this);
assignment = true;
+ {
+ SetFlag set(record_target);
+ binary.left->visit(*this);
+ }
+ if(binary.oper!="=")
+ self_referencing = true;
+ binary.right->visit(*this);
+ }
+ else if(record_target && binary.oper=="[")
+ {
binary.left->visit(*this);
+ SetForScope<bool> set(record_target, false);
+ binary.right->visit(*this);
}
else
TraversingVisitor::visit(binary);
{
assignment = false;
assignment_target = 0;
+ indeterminate_target = false;
+ self_referencing = false;
TraversingVisitor::visit(expr);
- if(assignment && assignment_target)
+ if(assignment && assignment_target && !indeterminate_target)
{
- if(assignment_target->interface!="out" || (stage->type!=FRAGMENT && !assignment_target->linked_declaration))
- {
- unused_nodes.insert(&expr);
- assignments[assignment_target] = &expr;
- }
- else
+ Node *&assign = assignments[assignment_target];
+ if(self_referencing)
+ unused_nodes.erase(assign);
+ else if(assign)
+ unused_nodes.insert(assign);
+ assign = &expr;
+ if(assignment_target->interface=="out" && (stage->type==FRAGMENT || assignment_target->linked_declaration))
unused_nodes.erase(assignment_target);
+ else
+ unused_nodes.insert(&expr);
}
assignment = false;
}
+void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
+{
+ SetForScope<Node *> set(aggregate, &strct);
+ unused_nodes.insert(&strct);
+ TraversingVisitor::visit(strct);
+}
+
void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var)
{
- unused_nodes.insert(&var);
+ if(aggregate)
+ aggregates[&var] = aggregate;
+ else
+ {
+ unused_nodes.insert(&var);
+ if(var.init_expression)
+ {
+ unused_nodes.insert(&*var.init_expression);
+ assignments[&var] = &*var.init_expression;
+ }
+ }
+ unused_nodes.erase(var.type_declaration);
TraversingVisitor::visit(var);
}
+void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
+{
+ SetForScope<Node *> set(aggregate, &iface);
+ unused_nodes.insert(&iface);
+ TraversingVisitor::visit(iface);
+}
-ProgramCompiler::NodeRemover::NodeRemover():
- n_removed(0),
- immutable_block(false),
- remove_block(false)
-{ }
void ProgramCompiler::NodeRemover::visit(Block &block)
{
- remove_block = immutable_block;
for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
- bool remove = to_remove.count(&**i);
- if(!remove)
- remove_block = false;
(*i)->visit(*this);
-
- if(remove ? !immutable_block : remove_block)
- {
+ if(to_remove.count(&**i))
block.body.erase(i++);
- ++n_removed;
- }
else
++i;
}
}
-void ProgramCompiler::NodeRemover::visit(StructDeclaration &strct)
-{
- SetFlag set(immutable_block);
- TraversingVisitor::visit(strct);
-}
-
void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
{
if(to_remove.count(&var))
if(var.linked_declaration)
var.linked_declaration->linked_declaration = 0;
}
-}
-
-void ProgramCompiler::NodeRemover::visit(InterfaceBlock &iface)
-{
- SetFlag set(immutable_block);
- TraversingVisitor::visit(iface);
+ else if(var.init_expression && to_remove.count(&*var.init_expression))
+ var.init_expression = 0;
}
} // namespace GL
projects / libs / gl.git / blobdiff