if(!module)
throw invalid_operation("ProgramCompiler::add_shaders");
- string head = "#version 150\n";
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
if(i->type==VERTEX)
- program.attach_shader_owned(new VertexShader(head+apply<Formatter>(*i)));
+ {
+ 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(head+apply<Formatter>(*i)));
+ program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
else if(i->type==FRAGMENT)
- program.attach_shader_owned(new FragmentShader(head+apply<Formatter>(*i)));
+ {
+ 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()
void ProgramCompiler::import(const string &name)
{
- if(!resources)
- throw runtime_error("no resources");
- RefPtr<IO::Seekable> io = resources->open_raw(name+".glsl");
+ string fn = name+".glsl";
+ RefPtr<IO::Seekable> io = (resources ? resources->open_raw(fn) : Resources::get_builtins().open(fn));
if(!io)
throw runtime_error(format("module %s not found", name));
ProgramParser import_parser;
{
inject_block(stage.content, module->shared.content);
+ apply<DeclarationReorderer>(stage);
+ apply<FunctionResolver>(stage);
apply<VariableResolver>(stage);
apply<InterfaceGenerator>(stage);
apply<VariableResolver>(stage);
apply<VariableRenamer>(stage);
+ apply<DeclarationReorderer>(stage);
+ apply<LegacyConverter>(stage);
}
bool ProgramCompiler::optimize(Stage &stage)
{
+ apply<ConstantConditionEliminator>(stage);
+
+ set<FunctionDeclaration *> inlineable = apply<InlineableFunctionLocator>(stage);
+ apply<FunctionInliner>(stage, inlineable);
+
set<Node *> unused = apply<UnusedVariableLocator>(stage);
+ set<Node *> unused2 = apply<UnusedFunctionLocator>(stage);
+ unused.insert(unused2.begin(), unused2.end());
apply<NodeRemover>(stage, unused);
return !unused.empty();
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());
}
else_if(0)
{ }
+void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s)
+{
+ const Version &ver = s.required_version;
+ if(ver.major)
+ formatted += format("#version %d%d\n", ver.major, ver.minor);
+ Visitor::apply(s);
+}
+
void ProgramCompiler::Formatter::visit(Literal &literal)
{
formatted += literal.token;
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 += ", ";
if(use_braces)
formatted += format("%s{\n", string(brace_indent*2, ' '));
- SetForScope<unsigned> set(indent, indent+!formatted.empty());
+ 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 += ", ";
formatted += ';';
}
+void ProgramCompiler::Formatter::visit(Jump &jump)
+{
+ formatted += jump.keyword;
+ formatted += ';';
+}
+
ProgramCompiler::DeclarationCombiner::DeclarationCombiner():
toplevel(true),
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;
}
-ProgramCompiler::InterfaceGenerator::InterfaceGenerator():
- scope_level(0),
+void ProgramCompiler::FunctionResolver::visit(FunctionCall &call)
+{
+ map<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
+ if(i!=functions.end())
+ call.declaration = i->second.back();
+
+ TraversingVisitor::visit(call);
+}
+
+void ProgramCompiler::FunctionResolver::visit(FunctionDeclaration &func)
+{
+ vector<FunctionDeclaration *> &decls = functions[func.name];
+ if(func.definition)
+ {
+ for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+ (*i)->definition = func.definition;
+ decls.clear();
+ decls.push_back(&func);
+ }
+ else if(!decls.empty() && decls.back()->definition)
+ func.definition = decls.back()->definition;
+ else
+ decls.push_back(&func);
+
+ TraversingVisitor::visit(func);
+}
+
+
+ProgramCompiler::BlockModifier::BlockModifier():
remove_node(false)
{ }
+void ProgramCompiler::BlockModifier::flatten_block(Block &block)
+{
+ insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
+ remove_node = true;
+}
+
+void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
+{
+ block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
+ insert_nodes.clear();
+
+ if(remove_node)
+ block.body.erase(i++);
+ else
+ ++i;
+ remove_node = false;
+}
+
+void ProgramCompiler::BlockModifier::visit(Block &block)
+{
+ for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ {
+ (*i)->visit(*this);
+ apply_and_increment(block, i);
+ }
+}
+
+
+ProgramCompiler::InterfaceGenerator::InterfaceGenerator():
+ scope_level(0)
+{ }
+
string ProgramCompiler::InterfaceGenerator::get_out_prefix(StageType type)
{
if(type==VERTEX)
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(list<Node *>::iterator j=insert_nodes.begin(); j!=insert_nodes.end(); ++j)
- block.body.insert(i, *j);
- insert_nodes.clear();
-
- if(remove_node)
- block.body.erase(i++);
- else
- ++i;
- remove_node = false;
+ apply_and_increment(block, i);
}
}
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(false)
+{ }
+
+ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap &v):
+ variable_values(&v),
+ result(0.0f),
+ result_valid(false)
+{ }
+
+void ProgramCompiler::ExpressionEvaluator::visit(Literal &literal)
+{
+ if(literal.token=="true")
+ result = 1.0f;
+ else if(literal.token=="false")
+ result = 0.0f;
+ else
+ result = lexical_cast<float>(literal.token);
+ result_valid = true;
+}
+
+void ProgramCompiler::ExpressionEvaluator::visit(ParenthesizedExpression &parexp)
+{
+ parexp.expression->visit(*this);
+}
+
+void ProgramCompiler::ExpressionEvaluator::visit(VariableReference &var)
+{
+ if(!var.declaration)
+ return;
+
+ if(variable_values)
+ {
+ ValueMap::const_iterator i = variable_values->find(var.declaration);
+ if(i!=variable_values->end())
+ i->second->visit(*this);
+ }
+ else if(var.declaration->init_expression)
+ var.declaration->init_expression->visit(*this);
+}
+
+void ProgramCompiler::ExpressionEvaluator::visit(UnaryExpression &unary)
+{
+ result_valid = false;
+ unary.expression->visit(*this);
+ if(!result_valid)
+ return;
+
+ if(unary.oper=="!")
+ result = !result;
+ else
+ result_valid = false;
+}
+
+void ProgramCompiler::ExpressionEvaluator::visit(BinaryExpression &binary)
+{
+ result_valid = false;
+ binary.left->visit(*this);
+ if(!result_valid)
+ return;
+
+ float left_result = result;
+ result_valid = false;
+ binary.right->visit(*this);
+ if(!result_valid)
+ return;
+
+ if(binary.oper=="<")
+ result = (left_result<result);
+ else if(binary.oper=="<=")
+ result = (left_result<=result);
+ else if(binary.oper==">")
+ result = (left_result>result);
+ else if(binary.oper==">=")
+ result = (left_result>=result);
+ else if(binary.oper=="==")
+ result = (left_result==result);
+ else if(binary.oper=="!=")
+ result = (left_result!=result);
+ else if(binary.oper=="&&")
+ result = (left_result && result);
+ else if(binary.oper=="||")
+ result = (left_result || result);
+ else
+ result_valid = false;
+}
+
+
+ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
+ scope_level(0)
+{ }
+
+void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
+{
+ SetForScope<unsigned> set(scope_level, scope_level+1);
+ BlockModifier::visit(block);
+
+ for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
+ variable_values.erase(i->second);
+}
+
+void ProgramCompiler::ConstantConditionEliminator::visit(Assignment &assign)
+{
+ variable_values.erase(assign.target_declaration);
+}
+
+void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &var)
+{
+ if(var.constant || scope_level>1)
+ variable_values[&var] = var.init_expression.get();
+}
+
+void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
+{
+ ExpressionEvaluator eval(variable_values);
+ cond.condition->visit(eval);
+ if(eval.result_valid)
+ flatten_block(eval.result ? cond.body : cond.else_body);
+ else
+ TraversingVisitor::visit(cond);
+}
+
+void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
+{
+ if(iter.condition)
+ {
+ ExpressionEvaluator eval;
+ iter.condition->visit(eval);
+ if(eval.result_valid && !eval.result)
+ {
+ remove_node = true;
+ return;
+ }
+ }
+
+ TraversingVisitor::visit(iter);
+}
+
+
ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
aggregate(0),
assignment(0),
- assignment_target(false)
+ assignment_target(false),
+ global_scope(true)
{ }
void ProgramCompiler::UnusedVariableLocator::apply(Stage &s)
{
- assignments.push_back(BlockAssignmentMap());
+ variables.push_back(BlockVariableMap());
Visitor::apply(s);
- assignments.pop_back();
+ BlockVariableMap &global_variables = variables.back();
+ for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
+ {
+ if(i->first->interface=="out" && (s.type==FRAGMENT || i->first->linked_declaration || !i->first->name.compare(0, 3, "gl_")))
+ continue;
+ if(!i->second.referenced)
+ {
+ unused_nodes.insert(i->first);
+ clear_assignments(i->second, true);
+ }
+ }
+ variables.pop_back();
}
void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
{
- unused_nodes.erase(var.declaration);
-
map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
if(i!=aggregates.end())
unused_nodes.erase(i->second);
- if(assignment_target)
- return;
-
- for(vector<BlockAssignmentMap>::iterator j=assignments.end(); j!=assignments.begin(); )
+ if(var.declaration && !assignment_target)
{
- --j;
- BlockAssignmentMap::iterator k = j->find(var.declaration);
- if(k!=j->end())
- {
- for(vector<Node *>::iterator l=k->second.nodes.begin(); l!=k->second.nodes.end(); ++l)
- unused_nodes.erase(*l);
- j->erase(k);
- break;
- }
+ VariableInfo &var_info = variables.back()[var.declaration];
+ var_info.assignments.clear();
+ var_info.referenced = true;
}
}
void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool self_ref)
{
- unused_nodes.insert(&node);
- BlockAssignmentMap &block_assignments = assignments.back();
- AssignmentList &var_assignments = block_assignments[&var];
+ VariableInfo &var_info = variables.back()[&var];
if(!self_ref)
- var_assignments.nodes.clear();
- var_assignments.nodes.push_back(&node);
- var_assignments.conditional = false;
- var_assignments.self_referencing = self_ref;
+ clear_assignments(var_info, true);
+ var_info.assignments.push_back(&node);
+ var_info.conditionally_assigned = false;
+}
+
+void ProgramCompiler::UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_unused)
+{
+ if(mark_unused)
+ {
+ for(vector<Node *>::iterator i=var_info.assignments.begin(); i!=var_info.assignments.end(); ++i)
+ unused_nodes.insert(*i);
+ }
+ var_info.assignments.clear();
}
void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
aggregates[&var] = aggregate;
else
{
- unused_nodes.insert(&var);
+ variables.back()[&var].local = true;
if(var.init_expression)
record_assignment(var, *var.init_expression, false);
}
void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
{
- assignments.push_back(BlockAssignmentMap());
-
- for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
- (*i)->visit(*this);
- func.body.visit(*this);
+ variables.push_back(BlockVariableMap());
- BlockAssignmentMap &block_assignments = assignments.back();
- for(map<string, VariableDeclaration *>::iterator i=func.body.variables.begin(); i!=func.body.variables.end(); ++i)
- block_assignments.erase(i->second);
- for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
{
- if(i->first->interface=="out" && stage->type!=FRAGMENT && !i->first->linked_declaration)
- continue;
-
- for(vector<Node *>::iterator j=i->second.nodes.begin(); j!=i->second.nodes.end(); ++j)
- unused_nodes.erase(*j);
+ SetForScope<bool> set(global_scope, false);
+ for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ (*i)->visit(*this);
+ func.body.visit(*this);
}
- assignments.pop_back();
+ BlockVariableMap &block_variables = variables.back();
+ for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
+ i->second.conditionally_assigned = true;
+ for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ block_variables[i->get()].referenced = true;
+ merge_down_variables();
}
-void ProgramCompiler::UnusedVariableLocator::merge_down_assignments()
+void ProgramCompiler::UnusedVariableLocator::merge_down_variables()
{
- BlockAssignmentMap &parent_assignments = assignments[assignments.size()-2];
- BlockAssignmentMap &block_assignments = assignments.back();
- for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
+ BlockVariableMap &parent_variables = variables[variables.size()-2];
+ BlockVariableMap &block_variables = variables.back();
+ for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
{
- BlockAssignmentMap::iterator j = parent_assignments.find(i->first);
- if(j==parent_assignments.end())
- parent_assignments.insert(*i);
- else if(i->second.self_referencing || i->second.conditional)
+ if(i->second.local)
{
- j->second.nodes.insert(j->second.nodes.end(), i->second.nodes.begin(), i->second.nodes.end());
- j->second.conditional |= i->second.conditional;
- j->second.self_referencing |= i->second.self_referencing;
+ if(!i->second.referenced)
+ unused_nodes.insert(i->first);
+ clear_assignments(i->second, true);
+ continue;
}
+
+ BlockVariableMap::iterator j = parent_variables.find(i->first);
+ if(j==parent_variables.end())
+ parent_variables.insert(*i);
else
- j->second = i->second;
+ {
+ if(i->second.referenced || !i->second.conditionally_assigned)
+ clear_assignments(j->second, !i->second.referenced);
+ j->second.conditionally_assigned = i->second.conditionally_assigned;
+ j->second.referenced |= i->second.referenced;
+ j->second.assignments.insert(j->second.assignments.end(), i->second.assignments.begin(), i->second.assignments.end());
+ }
}
- assignments.pop_back();
+ variables.pop_back();
}
void ProgramCompiler::UnusedVariableLocator::visit(Conditional &cond)
{
cond.condition->visit(*this);
- assignments.push_back(BlockAssignmentMap());
+ variables.push_back(BlockVariableMap());
cond.body.visit(*this);
- BlockAssignmentMap if_assignments;
- swap(assignments.back(), if_assignments);
+ BlockVariableMap if_variables;
+ swap(variables.back(), if_variables);
cond.else_body.visit(*this);
- BlockAssignmentMap &else_assignments = assignments.back();
- for(BlockAssignmentMap::iterator i=else_assignments.begin(); i!=else_assignments.end(); ++i)
+ BlockVariableMap &else_variables = variables.back();
+ for(BlockVariableMap::iterator i=else_variables.begin(); i!=else_variables.end(); ++i)
{
- BlockAssignmentMap::iterator j = if_assignments.find(i->first);
- if(j!=if_assignments.end())
+ BlockVariableMap::iterator j = if_variables.find(i->first);
+ if(j!=if_variables.end())
{
- i->second.nodes.insert(i->second.nodes.end(), j->second.nodes.begin(), j->second.nodes.end());
- i->second.conditional |= j->second.conditional;
- i->second.self_referencing |= j->second.self_referencing;
- if_assignments.erase(j);
+ i->second.assignments.insert(i->second.assignments.end(), j->second.assignments.begin(), j->second.assignments.end());
+ i->second.conditionally_assigned |= j->second.conditionally_assigned;
+ if_variables.erase(j);
}
else
- i->second.conditional = true;
+ i->second.conditionally_assigned = true;
}
- for(BlockAssignmentMap::iterator i=if_assignments.begin(); i!=if_assignments.end(); ++i)
+ for(BlockVariableMap::iterator i=if_variables.begin(); i!=if_variables.end(); ++i)
{
- i->second.conditional = true;
- else_assignments.insert(*i);
+ i->second.conditionally_assigned = true;
+ else_variables.insert(*i);
}
- merge_down_assignments();
+ merge_down_variables();
}
void ProgramCompiler::UnusedVariableLocator::visit(Iteration &iter)
{
- assignments.push_back(BlockAssignmentMap());
+ variables.push_back(BlockVariableMap());
TraversingVisitor::visit(iter);
- merge_down_assignments();
+
+ BlockVariableMap &block_variables = variables.back();
+ for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
+ if(!i->second.local && i->second.referenced)
+ i->second.assignments.clear();
+
+ merge_down_variables();
+}
+
+
+ProgramCompiler::UnusedVariableLocator::VariableInfo::VariableInfo():
+ local(false),
+ conditionally_assigned(false),
+ referenced(false)
+{ }
+
+
+void ProgramCompiler::UnusedFunctionLocator::visit(FunctionCall &call)
+{
+ TraversingVisitor::visit(call);
+
+ unused_nodes.erase(call.declaration);
+ if(call.declaration && call.declaration->definition!=call.declaration)
+ used_definitions.insert(call.declaration->definition);
+}
+
+void ProgramCompiler::UnusedFunctionLocator::visit(FunctionDeclaration &func)
+{
+ TraversingVisitor::visit(func);
+
+ if(func.name!="main" && !used_definitions.count(&func))
+ unused_nodes.insert(&func);
}
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;
}
+
+ProgramCompiler::LegacyConverter::LegacyConverter():
+ target_version(get_glsl_version())
+{ }
+
+ProgramCompiler::LegacyConverter::LegacyConverter(const Version &v):
+ target_version(v)
+{ }
+
+bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_version)
+{
+ if(target_version<feature_version)
+ return false;
+ else if(stage->required_version<feature_version)
+ stage->required_version = feature_version;
+
+ return true;
+}
+
+void ProgramCompiler::LegacyConverter::visit(VariableReference &var)
+{
+ if(var.name==frag_out_name && !check_version(Version(1, 30)))
+ {
+ var.name = "gl_FragColor";
+ var.declaration = 0;
+ type = "vec4";
+ }
+ else if(var.declaration)
+ type = var.declaration->type;
+ else
+ type = string();
+}
+
+void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
+{
+ if(call.name=="texture" && !call.declaration && !check_version(Version(1, 30)))
+ {
+ vector<RefPtr<Expression> >::iterator i = call.arguments.begin();
+ if(i!=call.arguments.end())
+ {
+ (*i)->visit(*this);
+ if(type=="sampler1D")
+ call.name = "texture1D";
+ else if(type=="sampler2D")
+ call.name = "texture2D";
+ else if(type=="sampler3D")
+ call.name = "texture3D";
+ else if(type=="sampler1DShadow")
+ call.name = "shadow1D";
+ else if(type=="sampler2DShadow")
+ call.name = "shadow2D";
+
+ for(; i!=call.arguments.end(); ++i)
+ (*i)->visit(*this);
+ }
+ }
+ else
+ TraversingVisitor::visit(call);
+}
+
+void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
+{
+ 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")
+ {
+ stage->locations[var.name] = location;
+ var.layout->qualifiers.erase(i);
+ }
+ else if(stage->type==FRAGMENT && var.interface=="out")
+ {
+ 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);
+}
+
+void ProgramCompiler::LegacyConverter::visit(InterfaceBlock &iface)
+{
+ if(!check_version(Version(1, 50)))
+ flatten_block(iface.members);
+}
+
} // namespace GL
} // namespace Msp