for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
if(i->type==VERTEX)
+ {
program.attach_shader_owned(new VertexShader(apply<Formatter>(*i)));
+ for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
+ program.bind_attribute(j->second, j->first);
+ }
else if(i->type==GEOMETRY)
program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
else if(i->type==FRAGMENT)
+ {
program.attach_shader_owned(new FragmentShader(apply<Formatter>(*i)));
+ for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
+ program.bind_fragment_data(j->second, j->first);
+ }
}
-
- program.bind_attribute(VERTEX4, "vertex");
- program.bind_attribute(NORMAL3, "normal");
- program.bind_attribute(COLOR4_FLOAT, "color");
- program.bind_attribute(TEXCOORD4, "texcoord");
}
Module *ProgramCompiler::create_builtins_module()
apply<InterfaceGenerator>(stage);
apply<VariableResolver>(stage);
apply<VariableRenamer>(stage);
+ apply<DeclarationReorderer>(stage);
apply<LegacyConverter>(stage);
- apply<VariableResolver>(stage);
}
bool ProgramCompiler::optimize(Stage &stage)
{
apply<ConstantConditionEliminator>(stage);
- apply<VariableResolver>(stage);
+
+ set<FunctionDeclaration *> inlineable = apply<InlineableFunctionLocator>(stage);
+ apply<FunctionInliner>(stage, inlineable);
set<Node *> unused = apply<UnusedVariableLocator>(stage);
set<Node *> unused2 = apply<UnusedFunctionLocator>(stage);
void ProgramCompiler::inject_block(Block &target, const Block &source)
{
- list<NodePtr<Node> >::iterator insert_point = target.body.begin();
- for(list<NodePtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
+ list<RefPtr<Node> >::iterator insert_point = target.body.begin();
+ for(list<RefPtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
target.body.insert(insert_point, (*i)->clone());
}
void ProgramCompiler::Formatter::visit(FunctionCall &call)
{
formatted += format("%s(", call.name);
- for(vector<NodePtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+ for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
{
if(i!=call.arguments.begin())
formatted += ", ";
SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
string spaces(indent*2, ' ');
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
if(i!=block.body.begin())
formatted += '\n';
if(!i->value.empty())
formatted += format("=%s", i->value);
}
- formatted += format(") %s;", layout.interface);
+ formatted += ')';
+}
+
+void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
+{
+ layout.layout.visit(*this);
+ formatted += format(" %s;", layout.interface);
}
void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
{
+ if(var.layout)
+ {
+ var.layout->visit(*this);
+ formatted += ' ';
+ }
if(var.constant)
formatted += "const ";
if(!var.sampling.empty())
void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
{
formatted += format("%s %s(", func.return_type, func.name);
- for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
{
if(i!=func.parameters.begin())
formatted += ", ";
return;
SetForScope<bool> set(toplevel, false);
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
remove_node = false;
(*i)->visit(*this);
VariableDeclaration *&ptr = variables[var.name];
if(ptr)
{
+ ptr->type = var.type;
if(var.init_expression)
ptr->init_expression = var.init_expression;
remove_node = true;
void ProgramCompiler::BlockModifier::flatten_block(Block &block)
{
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
- insert_nodes.push_back((*i)->clone());
+ insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
remove_node = true;
}
-void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<NodePtr<Node> >::iterator &i)
+void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
{
- for(list<Node *>::iterator j=insert_nodes.begin(); j!=insert_nodes.end(); ++j)
- block.body.insert(i, *j);
+ block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
insert_nodes.clear();
if(remove_node)
void ProgramCompiler::BlockModifier::visit(Block &block)
{
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
apply_and_increment(block, i);
void ProgramCompiler::InterfaceGenerator::visit(Block &block)
{
SetForScope<unsigned> set(scope_level, scope_level+1);
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
if(scope_level==1)
{
- for(map<string, VariableDeclaration *>::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
+ for(map<string, RefPtr<VariableDeclaration> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
{
- list<NodePtr<Node> >::iterator k = block.body.insert(i, j->second);
+ list<RefPtr<Node> >::iterator k = block.body.insert(i, j->second);
(*k)->visit(*this);
}
iface_declarations.clear();
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)
+ for(map<string, RefPtr<VariableDeclaration> >::const_iterator i=iface_declarations.begin(); i!=iface_declarations.end(); ++i)
if(i->second->interface=="in")
- pass_vars.push_back(i->second);
+ pass_vars.push_back(i->second.get());
if(stage->previous)
{
}
+ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
+ kind(NO_DECLARATION)
+{ }
+
+void ProgramCompiler::DeclarationReorderer::visit(Block &block)
+{
+ list<RefPtr<Node> >::iterator struct_insert_point = block.body.end();
+ list<RefPtr<Node> >::iterator variable_insert_point = block.body.end();
+
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ {
+ kind = NO_DECLARATION;
+ (*i)->visit(*this);
+
+ bool moved = false;
+ if(kind==STRUCT && struct_insert_point!=block.body.end())
+ {
+ block.body.insert(struct_insert_point, *i);
+ moved = true;
+ }
+ else if(kind>STRUCT && struct_insert_point==block.body.end())
+ struct_insert_point = i;
+
+ if(kind==VARIABLE && variable_insert_point!=block.body.end())
+ {
+ block.body.insert(variable_insert_point, *i);
+ moved = true;
+ }
+ else if(kind>VARIABLE && variable_insert_point==block.body.end())
+ variable_insert_point = i;
+
+ if(moved)
+ block.body.erase(i++);
+ else
+ ++i;
+ }
+}
+
+
+ProgramCompiler::InlineableFunctionLocator::InlineableFunctionLocator():
+ in_function(0)
+{ }
+
+void ProgramCompiler::InlineableFunctionLocator::visit(FunctionCall &call)
+{
+ FunctionDeclaration *def = call.declaration;
+ if(def && def->definition!=def)
+ def = def->definition;
+
+ if(def)
+ {
+ unsigned &count = refcounts[def];
+ ++count;
+ if(count>1 || def==in_function)
+ inlineable.erase(def);
+ }
+
+ TraversingVisitor::visit(call);
+}
+
+void ProgramCompiler::InlineableFunctionLocator::visit(FunctionDeclaration &func)
+{
+ unsigned &count = refcounts[func.definition];
+ if(!count && func.parameters.empty())
+ inlineable.insert(func.definition);
+
+ SetForScope<FunctionDeclaration *> set(in_function, &func);
+ TraversingVisitor::visit(func);
+}
+
+
+ProgramCompiler::FunctionInliner::FunctionInliner():
+ extract_result(0)
+{ }
+
+ProgramCompiler::FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
+ inlineable(in),
+ extract_result(0)
+{ }
+
+void ProgramCompiler::FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
+{
+ inline_result = 0;
+ ptr->visit(*this);
+ if(inline_result)
+ ptr = inline_result;
+}
+
+void ProgramCompiler::FunctionInliner::visit(Block &block)
+{
+ if(extract_result)
+ --extract_result;
+
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ {
+ (*i)->visit(*this);
+ if(extract_result)
+ --extract_result;
+ }
+}
+
+void ProgramCompiler::FunctionInliner::visit(UnaryExpression &unary)
+{
+ visit_and_inline(unary.expression);
+ inline_result = 0;
+}
+
+void ProgramCompiler::FunctionInliner::visit(BinaryExpression &binary)
+{
+ visit_and_inline(binary.left);
+ visit_and_inline(binary.right);
+ inline_result = 0;
+}
+
+void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
+{
+ for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+ visit_and_inline(*i);
+
+ FunctionDeclaration *def = call.declaration;
+ if(def && def->definition!=def)
+ def = def->definition;
+
+ if(def && inlineable.count(def))
+ {
+ extract_result = 2;
+ def->visit(*this);
+ }
+ else
+ inline_result = 0;
+}
+
+void ProgramCompiler::FunctionInliner::visit(Return &ret)
+{
+ TraversingVisitor::visit(ret);
+
+ if(extract_result)
+ inline_result = ret.expression->clone();
+}
+
+
ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator():
variable_values(0),
result(0.0f),
result_valid = true;
}
+void ProgramCompiler::ExpressionEvaluator::visit(ParenthesizedExpression &parexp)
+{
+ parexp.expression->visit(*this);
+}
+
void ProgramCompiler::ExpressionEvaluator::visit(VariableReference &var)
{
if(!var.declaration)
void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &var)
{
if(var.constant || scope_level>1)
- variable_values[&var] = &*var.init_expression;
+ variable_values[&var] = var.init_expression.get();
}
void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
{
assignments.push_back(BlockAssignmentMap());
- for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
(*i)->visit(*this);
func.body.visit(*this);
void ProgramCompiler::NodeRemover::visit(Block &block)
{
- for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
- if(to_remove.count(&**i))
+ if(to_remove.count(i->get()))
block.body.erase(i++);
else
++i;
{
stage->in_variables.erase(var.name);
stage->out_variables.erase(var.name);
+ stage->locations.erase(var.name);
if(var.linked_declaration)
var.linked_declaration->linked_declaration = 0;
}
- else if(var.init_expression && to_remove.count(&*var.init_expression))
+ else if(var.init_expression && to_remove.count(var.init_expression.get()))
var.init_expression = 0;
}
{
if(call.name=="texture" && !call.declaration && !check_version(Version(1, 30)))
{
- vector<NodePtr<Expression> >::iterator i = call.arguments.begin();
+ vector<RefPtr<Expression> >::iterator i = call.arguments.begin();
if(i!=call.arguments.end())
{
(*i)->visit(*this);
void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
{
- if(var.interface=="in" || var.interface=="out")
- if(!check_version(Version(1, 30)))
+ if(var.layout && !check_version(Version(3, 30)))
+ {
+ vector<Layout::Qualifier>::iterator i;
+ for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->identifier!="location"); ++i) ;
+ if(i!=var.layout->qualifiers.end())
{
+ unsigned location = lexical_cast<unsigned>(i->value);
if(stage->type==VERTEX && var.interface=="in")
- var.interface = "attribute";
- else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
- var.interface = "varying";
+ {
+ stage->locations[var.name] = location;
+ var.layout->qualifiers.erase(i);
+ }
else if(stage->type==FRAGMENT && var.interface=="out")
{
- frag_out_name = var.name;
- remove_node = true;
+ stage->locations[var.name] = location;
+ var.layout->qualifiers.erase(i);
}
+
+ if(var.layout->qualifiers.empty())
+ var.layout = 0;
+ }
+ }
+
+ if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30)))
+ {
+ if(stage->type==VERTEX && var.interface=="in")
+ var.interface = "attribute";
+ else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
+ var.interface = "varying";
+ else if(stage->type==FRAGMENT && var.interface=="out")
+ {
+ frag_out_name = var.name;
+ remove_node = true;
}
+ }
TraversingVisitor::visit(var);
}
projects / libs / gl.git / blobdiff