remover.to_remove = unused_locator.unused_nodes;
remover.apply(stage);
- return remover.n_removed;
+ return !unused_locator.unused_nodes.empty();
}
void ProgramCompiler::inject_block(Block &target, const Block &source)
iface_var->type = var.type;
iface_var->type_declaration = var.type_declaration;
iface_var->name = name;
- iface_var->array = (var.array || (stage->type==GEOMETRY && iface=="in"));
- iface_var->array_size = var.array_size;
+ if(stage->type==GEOMETRY)
+ iface_var->array = ((var.array && var.interface!="in") || iface=="in");
+ else
+ iface_var->array = var.array;
+ if(iface_var->array)
+ iface_var->array_size = var.array_size;
if(iface=="in")
iface_var->linked_declaration = &var;
iface_declarations[name] = iface_var;
ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
+ aggregate(0),
assignment(false),
record_target(false),
assignment_target(0),
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)
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(var.init_expression)
+ if(aggregate)
+ aggregates[&var] = aggregate;
+ else
{
- unused_nodes.insert(&*var.init_expression);
- assignments[&var] = &*var.init_expression;
+ 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))
var.init_expression = 0;
}
-void ProgramCompiler::NodeRemover::visit(InterfaceBlock &iface)
-{
- SetFlag set(immutable_block);
- TraversingVisitor::visit(iface);
-}
-
} // namespace GL
} // namespace Msp