using namespace std;
+namespace {
+
+const char builtins_src[] =
+ "////// vertex\n"
+ "out gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ " float gl_ClipDistance[];\n"
+ "};"
+ "////// geometry\n"
+ "in gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ " float gl_ClipDistance[];\n"
+ "} gl_in[];\n"
+ "out gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ " float gl_ClipDistance[];\n"
+ "};\n";
+
+}
+
namespace Msp {
namespace GL {
program.bind_attribute(TEXCOORD4, "texcoord");
}
+Module *ProgramCompiler::create_builtins_module()
+{
+ ProgramParser parser;
+ Module *module = new Module(parser.parse(builtins_src));
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ {
+ VariableResolver resolver;
+ i->content.visit(resolver);
+ for(map<string, VariableDeclaration *>::iterator j=i->content.variables.begin(); j!=i->content.variables.end(); ++j)
+ j->second->linked_declaration = j->second;
+ }
+ return module;
+}
+
+Module &ProgramCompiler::get_builtins_module()
+{
+ static RefPtr<Module> builtins_module = create_builtins_module();
+ return *builtins_module;
+}
+
+Stage *ProgramCompiler::get_builtins(StageType type)
+{
+ Module &module = get_builtins_module();
+ for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
+ if(i->type==type)
+ return &*i;
+ return 0;
+}
+
void ProgramCompiler::process()
{
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
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)
formatted += "const ";
if(!var.sampling.empty())
formatted += format("%s ", var.sampling);
- if(!var.interface.empty())
+ if(!var.interface.empty() && var.interface!=block_interface)
formatted += format("%s ", var.interface);
formatted += format("%s %s", var.type, var.name);
if(var.array)
void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
{
+ SetForScope<string> set(block_interface, iface.interface);
formatted += format("%s %s\n", iface.interface, iface.name);
iface.members.visit(*this);
formatted += ';';
anonymous(false)
{ }
+void ProgramCompiler::VariableResolver::apply(Stage &s)
+{
+ SetForScope<Stage *> set(stage, &s);
+ Stage *builtins = get_builtins(stage->type);
+ if(builtins)
+ blocks.push_back(&builtins->content);
+ stage->content.visit(*this);
+ if(builtins)
+ blocks.pop_back();
+}
+
void ProgramCompiler::VariableResolver::visit(Block &block)
{
blocks.push_back(&block);
var.type_declaration = j->second;
}
+ if(!block_interface.empty() && var.interface.empty())
+ var.interface = block_interface;
+
TraversingVisitor::visit(var);
blocks.back()->variables[var.name] = &var;
if(anonymous && blocks.size()>1)
void ProgramCompiler::VariableResolver::visit(InterfaceBlock &iface)
{
SetFlag set(anonymous);
+ SetForScope<string> set2(block_interface, iface.interface);
TraversingVisitor::visit(iface);
}
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;
}
}
+ if(stage->type==GEOMETRY)
+ {
+ VariableReference *ref = new VariableReference;
+ ref->name = "gl_in";
+
+ BinaryExpression *subscript = new BinaryExpression;
+ subscript->left = ref;
+ subscript->oper = "[";
+ subscript->right = pass.subscript;
+ subscript->after = "]";
+
+ MemberAccess *memacc = new MemberAccess;
+ memacc->left = subscript;
+ memacc->member = "gl_Position";
+
+ insert_assignment("gl_Position", memacc);
+ }
+
for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
{
string out_name = change_prefix((*i)->name, out_prefix);
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)
{
Node *&assign = assignments[assignment_target];
- if(assign)
+ 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.insert(&expr);
- else
+ 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