+#include <msp/core/algorithm.h>
#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_explicit_attrib_location.h>
+#include <msp/gl/extensions/arb_gpu_shader5.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/ext_gpu_shader4.h>
+#include <msp/gl/extensions/ext_texture_array.h>
#include <msp/strings/format.h>
+#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include "error.h"
#include "program.h"
#include "resources.h"
#include "shader.h"
+#undef interface
+
using namespace std;
namespace {
const char builtins_src[] =
- "////// vertex\n"
+ "#pragma MSP stage(vertex)\n"
"out gl_PerVertex {\n"
" vec4 gl_Position;\n"
" float gl_ClipDistance[];\n"
- "};"
- "////// geometry\n"
+ "};\n"
+ "#pragma MSP stage(geometry)\n"
"in gl_PerVertex {\n"
" vec4 gl_Position;\n"
" float gl_ClipDistance[];\n"
module(0)
{ }
-void ProgramCompiler::compile(const string &source)
+ProgramCompiler::~ProgramCompiler()
+{
+ delete module;
+}
+
+void ProgramCompiler::compile(const string &source, const string &src_name)
{
resources = 0;
- module = &parser.parse(source);
+ delete module;
+ module = new Module();
+ ProgramParser parser;
+ imported_names.push_back(src_name);
+ append_module(parser.parse(source, src_name, 1));
process();
}
-void ProgramCompiler::compile(IO::Base &io, Resources *res)
+void ProgramCompiler::compile(IO::Base &io, Resources *res, const string &src_name)
{
resources = res;
- module = &parser.parse(io);
+ delete module;
+ module = new Module();
+ ProgramParser parser;
+ imported_names.push_back(src_name);
+ append_module(parser.parse(io, src_name, 1));
process();
}
+void ProgramCompiler::compile(IO::Base &io, const string &src_name)
+{
+ compile(io, 0, src_name);
+}
+
void ProgramCompiler::add_shaders(Program &program)
{
if(!module)
throw invalid_operation("ProgramCompiler::add_shaders");
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ try
{
- if(i->type==VERTEX)
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++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);
+ 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)));
+ if(EXT_gpu_shader4)
+ {
+ for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
+ program.bind_fragment_data(j->second, j->first);
+ }
+ }
}
- else if(i->type==GEOMETRY)
- program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
- else if(i->type==FRAGMENT)
+ }
+ catch(const compile_error &e)
+ {
+ static const Regex r_message("^(([0-9]+)\\(([0-9]+)\\) :|ERROR: ([0-9]+):([0-9]+):) (.*)$");
+ vector<string> lines = split(e.what(), '\n');
+ string translated;
+ for(vector<string>::const_iterator i=lines.begin(); i!=lines.end(); ++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);
+ RegMatch m = r_message.match(*i);
+ if(m)
+ {
+ unsigned index = 0;
+ unsigned line = 0;
+ if(m[2])
+ {
+ index = lexical_cast<unsigned>(m[2].str);
+ line = lexical_cast<unsigned>(m[3].str);
+ }
+ else if(m[4])
+ {
+ index = lexical_cast<unsigned>(m[4].str);
+ line = lexical_cast<unsigned>(m[5].str);
+ }
+ const char *src = "<unknown>";
+ if(index==0)
+ src = "<generated>";
+ else if(index-1<imported_names.size())
+ src = imported_names[index-1].c_str();
+ translated += format("%s:%d: %s", src, line, m[6].str);
+ }
+ else
+ translated += *i;
+ translated += '\n';
}
+
+ throw compile_error(translated);
}
}
Module *ProgramCompiler::create_builtins_module()
{
ProgramParser parser;
- Module *module = new Module(parser.parse(builtins_src));
+ Module *module = new Module(parser.parse(builtins_src, "<builtin>"));
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
VariableResolver resolver;
return 0;
}
-void ProgramCompiler::process()
+void ProgramCompiler::append_module(ProgramSyntax::Module &mod)
+{
+ vector<Import *> imports = apply<NodeGatherer<Import> >(mod.shared);
+ for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
+ import((*i)->module);
+ apply<NodeRemover>(mod.shared, set<Node *>(imports.begin(), imports.end()));
+
+ append_stage(mod.shared);
+ for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
+ append_stage(*i);
+}
+
+void ProgramCompiler::append_stage(Stage &stage)
{
- list<Import *> imports = apply<NodeGatherer<Import> >(module->shared);
- for(list<Import *>::iterator i=imports.end(); i!=imports.begin(); )
- import((*--i)->module);
- apply<NodeRemover>(module->shared, set<Node *>(imports.begin(), imports.end()));
+ Stage *target = 0;
+ if(stage.type==SHARED)
+ target = &module->shared;
+ else
+ {
+ list<Stage>::iterator i;
+ for(i=module->stages.begin(); (i!=module->stages.end() && i->type<stage.type); ++i) ;
+ if(i==module->stages.end() || i->type>stage.type)
+ {
+ list<Stage>::iterator j = module->stages.insert(i, stage.type);
+ if(i!=module->stages.end())
+ i->previous = &*j;
+ i = j;
+ if(i!=module->stages.begin())
+ i->previous = &*--j;
+ }
+
+ target = &*i;
+ }
+
+ if(stage.required_version>target->required_version)
+ target->required_version = stage.required_version;
+ for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
+ target->content.body.push_back(*i);
+ apply<DeclarationCombiner>(*target);
+}
+void ProgramCompiler::process()
+{
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(); )
void ProgramCompiler::import(const string &name)
{
string fn = name+".glsl";
+ if(find(imported_names, fn)!=imported_names.end())
+ return;
+ imported_names.push_back(fn);
+
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;
- Module &imported_module = import_parser.parse(*io);
-
- inject_block(module->shared.content, imported_module.shared.content);
- apply<DeclarationCombiner>(module->shared);
- for(list<Stage>::iterator i=imported_module.stages.begin(); i!=imported_module.stages.end(); ++i)
- {
- list<Stage>::iterator j;
- for(j=module->stages.begin(); (j!=module->stages.end() && j->type<i->type); ++j) ;
- if(j==module->stages.end() || j->type>i->type)
- {
- j = module->stages.insert(j, *i);
- list<Stage>::iterator k = j;
- if(++k!=module->stages.end())
- k->previous = &*j;
- if(j!=module->stages.begin())
- j->previous = &*--(k=j);
- }
- else
- {
- inject_block(j->content, i->content);
- apply<DeclarationCombiner>(*j);
- }
- }
+ append_module(import_parser.parse(*io, fn, imported_names.size()));
}
void ProgramCompiler::generate(Stage &stage)
{
+ if(module->shared.required_version>stage.required_version)
+ stage.required_version = module->shared.required_version;
inject_block(stage.content, module->shared.content);
apply<DeclarationReorderer>(stage);
apply<VariableResolver>(stage);
apply<InterfaceGenerator>(stage);
apply<VariableResolver>(stage);
- apply<VariableRenamer>(stage);
apply<DeclarationReorderer>(stage);
+ apply<FunctionResolver>(stage);
apply<LegacyConverter>(stage);
}
void ProgramCompiler::inject_block(Block &target, const Block &source)
{
- list<RefPtr<Node> >::iterator insert_point = target.body.begin();
- for(list<RefPtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
+ NodeList<Statement>::iterator insert_point = target.body.begin();
+ for(NodeList<Statement>::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
target.body.insert(insert_point, (*i)->clone());
}
}
+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, NodeList<Statement>::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(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+ {
+ (*i)->visit(*this);
+ apply_and_increment(block, i);
+ }
+}
+
+
ProgramCompiler::Formatter::Formatter():
+ source_index(0),
+ source_line(1),
indent(0),
- parameter_list(false),
- else_if(0)
+ parameter_list(false)
{ }
void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s)
if(ver)
{
- formatted += format("#version %d%02d", ver.major, ver.minor);
+ append(format("#version %d%02d", ver.major, ver.minor));
if(api==OPENGL_ES2 && ver>=Version(3, 0))
- formatted += " es";
+ append(" es");
formatted += '\n';
}
+ for(vector<const Extension *>::const_iterator i=s.required_extensions.begin(); i!=s.required_extensions.end(); ++i)
+ append(format("#extension %s: require\n", (*i)->get_name()));
+ if(!s.required_extensions.empty())
+ formatted += '\n';
+
Visitor::apply(s);
}
+void ProgramCompiler::Formatter::append(const string &text)
+{
+ formatted += text;
+ for(string::const_iterator i=text.begin(); i!=text.end(); ++i)
+ if(*i=='\n')
+ ++source_line;
+}
+
+void ProgramCompiler::Formatter::append(char c)
+{
+ formatted += c;
+ if(c=='\n')
+ ++source_line;
+}
+
+void ProgramCompiler::Formatter::set_source(unsigned index, unsigned line)
+{
+ if(index!=source_index || (index && line!=source_line))
+ {
+ if(index==source_index && line==source_line+1)
+ formatted += '\n';
+ else
+ {
+ unsigned l = line;
+ if(stage->required_version<Version(3, 30))
+ --l;
+ formatted += format("#line %d %d\n", l, index);
+ }
+ }
+ source_index = index;
+ source_line = line;
+}
+
void ProgramCompiler::Formatter::visit(Literal &literal)
{
- formatted += literal.token;
+ append(literal.token);
}
void ProgramCompiler::Formatter::visit(ParenthesizedExpression &parexpr)
{
- formatted += '(';
+ append('(');
parexpr.expression->visit(*this);
- formatted += ')';
+ append(')');
}
void ProgramCompiler::Formatter::visit(VariableReference &var)
{
- formatted += var.name;
+ append(var.name);
}
void ProgramCompiler::Formatter::visit(MemberAccess &memacc)
{
memacc.left->visit(*this);
- formatted += format(".%s", memacc.member);
+ append(format(".%s", memacc.member));
}
void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
{
if(unary.prefix)
- formatted += unary.oper;
+ append(unary.oper);
unary.expression->visit(*this);
if(!unary.prefix)
- formatted += unary.oper;
+ append(unary.oper);
}
void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
{
binary.left->visit(*this);
- formatted += binary.oper;
+ append(binary.oper);
binary.right->visit(*this);
- formatted += binary.after;
+ append(binary.after);
}
void ProgramCompiler::Formatter::visit(Assignment &assign)
{
assign.left->visit(*this);
- formatted += format(" %s ", assign.oper);
+ append(format(" %s ", assign.oper));
assign.right->visit(*this);
}
void ProgramCompiler::Formatter::visit(FunctionCall &call)
{
- formatted += format("%s(", call.name);
- for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+ append(format("%s(", call.name));
+ for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
{
if(i!=call.arguments.begin())
- formatted += ", ";
+ append(", ");
(*i)->visit(*this);
}
- formatted += ')';
+ append(')');
}
void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
{
expr.expression->visit(*this);
- formatted += ';';
+ append(';');
}
void ProgramCompiler::Formatter::visit(Block &block)
{
- if(else_if)
- --else_if;
-
unsigned brace_indent = indent;
bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
if(use_braces)
- formatted += format("%s{\n", string(brace_indent*2, ' '));
+ append(format("%s{\n", string(brace_indent*2, ' ')));
SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
string spaces(indent*2, ' ');
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
if(i!=block.body.begin())
- formatted += '\n';
- formatted += spaces;
+ append('\n');
+ set_source((*i)->source, (*i)->line);
+ append(spaces);
(*i)->visit(*this);
- else_if = 0;
}
if(use_braces)
- formatted += format("\n%s}", string(brace_indent*2, ' '));
+ append(format("\n%s}", string(brace_indent*2, ' ')));
}
void ProgramCompiler::Formatter::visit(Import &import)
{
- formatted += format("import %s;", import.module);
+ append(format("import %s;", import.module));
}
void ProgramCompiler::Formatter::visit(Precision &prec)
{
- formatted += format("precision %s %s;", prec.precision, prec.type);
+ append(format("precision %s %s;", prec.precision, prec.type));
}
void ProgramCompiler::Formatter::visit(Layout &layout)
{
- formatted += "layout(";
+ append("layout(");
for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
{
if(i!=layout.qualifiers.begin())
- formatted += ", ";
- formatted += i->identifier;
+ append(", ");
+ append(i->identifier);
if(!i->value.empty())
- formatted += format("=%s", i->value);
+ append(format("=%s", i->value));
}
- formatted += ')';
+ append(')');
}
void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
{
layout.layout.visit(*this);
- formatted += format(" %s;", layout.interface);
+ append(format(" %s;", layout.interface));
}
void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
{
- formatted += format("struct %s\n", strct.name);
+ append(format("struct %s\n", strct.name));
strct.members.visit(*this);
- formatted += ';';
+ append(';');
}
void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
if(var.layout)
{
var.layout->visit(*this);
- formatted += ' ';
+ append(' ');
}
if(var.constant)
- formatted += "const ";
+ append("const ");
+ if(!var.interpolation.empty())
+ append(format("%s ", var.interpolation));
if(!var.sampling.empty())
- formatted += format("%s ", var.sampling);
+ append(format("%s ", var.sampling));
if(!var.interface.empty() && var.interface!=block_interface)
{
string interface = var.interface;
else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
interface = "varying";
}
- formatted += format("%s ", interface);
+ append(format("%s ", interface));
}
if(!var.precision.empty())
- formatted += format("%s ", var.precision);
- formatted += format("%s %s", var.type, var.name);
+ append(format("%s ", var.precision));
+ append(format("%s %s", var.type, var.name));
if(var.array)
{
- formatted += '[';
+ append('[');
if(var.array_size)
var.array_size->visit(*this);
- formatted += ']';
+ append(']');
}
if(var.init_expression)
{
- formatted += " = ";
+ append(" = ");
var.init_expression->visit(*this);
}
if(!parameter_list)
- formatted += ';';
+ append(';');
}
void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
{
SetForScope<string> set(block_interface, iface.interface);
- formatted += format("%s %s\n", iface.interface, iface.name);
+ append(format("%s %s\n", iface.interface, iface.name));
iface.members.visit(*this);
- formatted += ';';
+ append(';');
}
void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
{
- formatted += format("%s %s(", func.return_type, func.name);
- for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ append(format("%s %s(", func.return_type, func.name));
+ for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
{
if(i!=func.parameters.begin())
- formatted += ", ";
+ append(", ");
SetFlag set(parameter_list);
(*i)->visit(*this);
}
- formatted += ')';
+ append(')');
if(func.definition==&func)
{
- formatted += '\n';
+ append('\n');
func.body.visit(*this);
}
else
- formatted += ';';
+ append(';');
}
void ProgramCompiler::Formatter::visit(Conditional &cond)
{
- if(else_if)
- formatted.replace(formatted.rfind('\n'), string::npos, 1, ' ');
-
- indent -= else_if;
-
- formatted += "if(";
+ append("if(");
cond.condition->visit(*this);
- formatted += ")\n";
+ append(")\n");
cond.body.visit(*this);
if(!cond.else_body.body.empty())
{
- formatted += format("\n%selse\n", string(indent*2, ' '));
- SetForScope<unsigned> set(else_if, 2);
- cond.else_body.visit(*this);
+ Conditional *else_cond = dynamic_cast<Conditional *>(cond.else_body.body.front().get());
+ if(cond.else_body.body.size()==1 && else_cond)
+ {
+ append('\n');
+ set_source(else_cond->source, else_cond->line);
+ append(format("%selse ", string(indent*2, ' ')));
+ else_cond->visit(*this);
+ }
+ else
+ {
+ append(format("\n%selse\n", string(indent*2, ' ')));
+ cond.else_body.visit(*this);
+ }
}
}
void ProgramCompiler::Formatter::visit(Iteration &iter)
{
- formatted += "for(";
- iter.init_statement->visit(*this);
- formatted += ' ';
- iter.condition->visit(*this);
- formatted += "; ";
- iter.loop_expression->visit(*this);
- formatted += ")\n";
- iter.body.visit(*this);
+ if(!iter.init_statement && iter.condition && !iter.loop_expression)
+ {
+ append("while(");
+ iter.condition->visit(*this);
+ append(')');
+ }
+ else
+ {
+ append("for(");
+ if(iter.init_statement)
+ iter.init_statement->visit(*this);
+ else
+ append(';');
+ if(iter.condition)
+ {
+ append(' ');
+ iter.condition->visit(*this);
+ }
+ append(';');
+ if(iter.loop_expression)
+ {
+ append(' ');
+ iter.loop_expression->visit(*this);
+ }
+ append(')');
+ }
+
+ if(iter.body.body.empty())
+ append(" { }");
+ else
+ {
+ append('\n');
+ iter.body.visit(*this);
+ }
}
void ProgramCompiler::Formatter::visit(Return &ret)
{
- formatted += "return ";
- ret.expression->visit(*this);
- formatted += ';';
+ append("return");
+ if(ret.expression)
+ {
+ append(' ');
+ ret.expression->visit(*this);
+ }
+ append(';');
}
void ProgramCompiler::Formatter::visit(Jump &jump)
{
- formatted += jump.keyword;
- formatted += ';';
+ append(jump.keyword);
+ append(';');
}
ProgramCompiler::DeclarationCombiner::DeclarationCombiner():
- toplevel(true),
- remove_node(false)
+ toplevel(true)
{ }
void ProgramCompiler::DeclarationCombiner::visit(Block &block)
return;
SetForScope<bool> set(toplevel, false);
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
- {
- remove_node = false;
- (*i)->visit(*this);
- if(remove_node)
- block.body.erase(i++);
- else
- ++i;
- }
+ BlockModifier::visit(block);
}
void ProgramCompiler::DeclarationCombiner::visit(FunctionDeclaration &func)
ptr->type = var.type;
if(var.init_expression)
ptr->init_expression = var.init_expression;
+ if(var.layout)
+ {
+ if(ptr->layout)
+ {
+ for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
+ {
+ bool found = false;
+ for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
+ if(j->identifier==i->identifier)
+ {
+ j->value = i->value;
+ found = true;
+ }
+
+ if(!found)
+ ptr->layout->qualifiers.push_back(*i);
+ }
+ }
+ else
+ ptr->layout = var.layout;
+ }
remove_node = true;
}
else
}
-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)
{ }
void ProgramCompiler::InterfaceGenerator::visit(Block &block)
{
SetForScope<unsigned> set(scope_level, scope_level+1);
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
{
for(map<string, RefPtr<VariableDeclaration> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
{
- list<RefPtr<Node> >::iterator k = block.body.insert(i, j->second);
+ NodeList<Statement>::iterator k = block.body.insert(i, j->second);
(*k)->visit(*this);
}
iface_declarations.clear();
return true;
}
-void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left, ProgramSyntax::Expression *right)
+ExpressionStatement &ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left, ProgramSyntax::Expression *right)
{
Assignment *assign = new Assignment;
VariableReference *ref = new VariableReference;
ExpressionStatement *stmt = new ExpressionStatement;
stmt->expression = assign;
+ stmt->visit(*this);
insert_nodes.push_back(stmt);
+
+ return *stmt;
}
void ProgramCompiler::InterfaceGenerator::visit(VariableReference &var)
if(i==prev_out.end())
i = prev_out.find(in_prefix+var.name);
if(i!=prev_out.end())
- generate_interface(*i->second, "in", var.name);
+ {
+ generate_interface(*i->second, "in", i->second->name);
+ var.name = i->second->name;
+ }
}
void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var)
{
remove_node = true;
if(var.init_expression)
- insert_assignment(var.name, var.init_expression->clone());
+ {
+ ExpressionStatement &stmt = insert_assignment(var.name, var.init_expression->clone());
+ stmt.source = var.source;
+ stmt.line = var.line;
+ return;
+ }
}
}
else if(var.interface=="in")
}
-void ProgramCompiler::VariableRenamer::visit(VariableReference &var)
-{
- if(var.declaration)
- var.name = var.declaration->name;
-}
-
-void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
-{
- if(var.linked_declaration)
- var.name = var.linked_declaration->name;
- TraversingVisitor::visit(var);
-}
-
-
ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
+ scope_level(0),
kind(NO_DECLARATION)
{ }
+void ProgramCompiler::DeclarationReorderer::visit(FunctionCall &call)
+{
+ FunctionDeclaration *def = call.declaration;
+ if(def)
+ def = def->definition;
+ if(def && !ordered_funcs.count(def))
+ needed_funcs.insert(def);
+}
+
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();
+ SetForScope<unsigned> set(scope_level, scope_level+1);
+ if(scope_level>1)
+ return Visitor::visit(block);
+
+ NodeList<Statement>::iterator struct_insert_point = block.body.end();
+ NodeList<Statement>::iterator variable_insert_point = block.body.end();
+ NodeList<Statement>::iterator function_insert_point = block.body.end();
+ unsigned unordered_func_count = 0;
+ bool ordered_any_funcs = false;
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
{
kind = NO_DECLARATION;
(*i)->visit(*this);
else if(kind>VARIABLE && variable_insert_point==block.body.end())
variable_insert_point = i;
+ if(kind==FUNCTION)
+ {
+ if(function_insert_point==block.body.end())
+ function_insert_point = i;
+
+ if(needed_funcs.empty())
+ {
+ ordered_funcs.insert(i->get());
+ if(i!=function_insert_point)
+ {
+ block.body.insert(function_insert_point, *i);
+ moved = true;
+ }
+ else
+ ++function_insert_point;
+ ordered_any_funcs = true;
+ }
+ else
+ ++unordered_func_count;
+ }
+
if(moved)
+ {
+ if(function_insert_point==i)
+ ++function_insert_point;
block.body.erase(i++);
+ }
else
++i;
+
+ if(i==block.body.end() && unordered_func_count)
+ {
+ if(!ordered_any_funcs)
+ // A subset of the remaining functions forms a recursive loop
+ /* TODO pick a function and move it up, adding any necessary
+ declarations */
+ break;
+
+ i = function_insert_point;
+ unordered_func_count = 0;
+ }
}
}
+void ProgramCompiler::DeclarationReorderer::visit(ProgramSyntax::VariableDeclaration &var)
+{
+ Visitor::visit(var);
+ kind = VARIABLE;
+}
+
+void ProgramCompiler::DeclarationReorderer::visit(FunctionDeclaration &func)
+{
+ needed_funcs.clear();
+ func.body.visit(*this);
+ needed_funcs.erase(&func);
+ kind = FUNCTION;
+}
+
ProgramCompiler::InlineableFunctionLocator::InlineableFunctionLocator():
in_function(0)
if(extract_result)
--extract_result;
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
(*i)->visit(*this);
if(extract_result)
inline_result = 0;
}
+void ProgramCompiler::FunctionInliner::visit(MemberAccess &memacc)
+{
+ visit_and_inline(memacc.left);
+ inline_result = 0;
+}
+
void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
{
- for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+ for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
visit_and_inline(*i);
FunctionDeclaration *def = call.declaration;
inline_result = 0;
}
+void ProgramCompiler::FunctionInliner::visit(VariableDeclaration &var)
+{
+ if(var.init_expression)
+ visit_and_inline(var.init_expression);
+ inline_result = 0;
+}
+
void ProgramCompiler::FunctionInliner::visit(Return &ret)
{
TraversingVisitor::visit(ret);
ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
- scope_level(0)
+ scope_level(0),
+ record_only(false)
{ }
void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
variable_values.erase(i->second);
}
+void ProgramCompiler::ConstantConditionEliminator::visit(UnaryExpression &unary)
+{
+ if(VariableReference *var = dynamic_cast<VariableReference *>(unary.expression.get()))
+ if(unary.oper=="++" || unary.oper=="--")
+ variable_values.erase(var->declaration);
+}
+
void ProgramCompiler::ConstantConditionEliminator::visit(Assignment &assign)
{
variable_values.erase(assign.target_declaration);
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);
+ if(!record_only)
+ {
+ ExpressionEvaluator eval(variable_values);
+ cond.condition->visit(eval);
+ if(eval.result_valid)
+ {
+ flatten_block(eval.result ? cond.body : cond.else_body);
+ return;
+ }
+ }
+
+ TraversingVisitor::visit(cond);
}
void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
{
- if(iter.condition)
+ if(!record_only)
{
- ExpressionEvaluator eval;
- iter.condition->visit(eval);
- if(eval.result_valid && !eval.result)
+ if(iter.condition)
{
- remove_node = true;
- return;
+ /* If the loop condition is always false on the first iteration, the
+ entire loop can be removed */
+ if(iter.init_statement)
+ iter.init_statement->visit(*this);
+ ExpressionEvaluator eval(variable_values);
+ iter.condition->visit(eval);
+ if(eval.result_valid && !eval.result)
+ {
+ remove_node = true;
+ return;
+ }
}
+
+ /* Record all assignments that occur inside the loop body so those
+ variables won't be considered as constant */
+ SetFlag set_record(record_only);
+ TraversingVisitor::visit(iter);
}
TraversingVisitor::visit(iter);
+
+ if(VariableDeclaration *init_decl = dynamic_cast<VariableDeclaration *>(iter.init_statement.get()))
+ variable_values.erase(init_decl);
}
aggregate(0),
assignment(0),
assignment_target(false),
+ assign_to_subscript(false),
global_scope(true)
{ }
{
if(binary.oper=="[")
{
+ if(assignment_target)
+ assign_to_subscript = true;
binary.left->visit(*this);
SetForScope<bool> set(assignment_target, false);
binary.right->visit(*this);
void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
{
{
+ assign_to_subscript = false;
SetForScope<bool> set(assignment_target, !assign.self_referencing);
assign.left->visit(*this);
}
assignment = &assign;
}
-void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool self_ref)
+void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool chained)
{
VariableInfo &var_info = variables.back()[&var];
- if(!self_ref)
+ if(!chained)
clear_assignments(var_info, true);
var_info.assignments.push_back(&node);
var_info.conditionally_assigned = false;
assignment = 0;
TraversingVisitor::visit(expr);
if(assignment && assignment->target_declaration)
- record_assignment(*assignment->target_declaration, expr, assignment->self_referencing);
+ record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript));
}
void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
{
SetForScope<bool> set(global_scope, false);
- for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
(*i)->visit(*this);
func.body.visit(*this);
}
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)
+ for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
block_variables[i->get()].referenced = true;
merge_down_variables();
}
{
if(!i->second.referenced)
unused_nodes.insert(i->first);
- clear_assignments(i->second, true);
+ clear_assignments(i->second, i->first->interface!="out");
continue;
}
void ProgramCompiler::NodeRemover::visit(Block &block)
{
- for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
if(to_remove.count(i->get()))
var.init_expression = 0;
}
+void ProgramCompiler::NodeRemover::visit(Iteration &iter)
+{
+ if(to_remove.count(iter.init_statement.get()))
+ iter.init_statement = 0;
+ TraversingVisitor::visit(iter);
+}
+
void ProgramCompiler::PrecisionRemover::visit(Precision &)
{
return true;
}
+bool ProgramCompiler::LegacyConverter::check_extension(const Extension &extension) const
+{
+ if(!extension)
+ return false;
+
+ vector<const Extension *>::iterator i = find(stage->required_extensions, &extension);
+ if(i==stage->required_extensions.end())
+ stage->required_extensions.push_back(&extension);
+
+ return true;
+}
+
bool ProgramCompiler::LegacyConverter::supports_unified_interface_syntax() const
{
if(target_api==OPENGL_ES2)
{
if(call.name=="texture" && !call.declaration && !supports_unified_sampling_functions())
{
- vector<RefPtr<Expression> >::iterator i = call.arguments.begin();
+ NodeArray<Expression>::iterator i = call.arguments.begin();
if(i!=call.arguments.end())
{
(*i)->visit(*this);
call.name = "texture2D";
else if(type=="sampler3D")
call.name = "texture3D";
+ else if(type=="samplerCube")
+ call.name = "textureCube";
else if(type=="sampler1DShadow")
call.name = "shadow1D";
else if(type=="sampler2DShadow")
call.name = "shadow2D";
+ else if(type=="sampler1DArray")
+ {
+ check_extension(EXT_texture_array);
+ call.name = "texture1DArray";
+ }
+ else if(type=="sampler2DArray")
+ {
+ check_extension(EXT_texture_array);
+ call.name = "texture2DArray";
+ }
+ else if(type=="sampler1DArrayShadow")
+ {
+ check_extension(EXT_texture_array);
+ call.name = "shadow1DArray";
+ }
+ else if(type=="sampler2DArrayShadow")
+ {
+ check_extension(EXT_texture_array);
+ call.name = "shadow2DArray";
+ }
for(; i!=call.arguments.end(); ++i)
(*i)->visit(*this);
{
if(target_api==OPENGL_ES2)
return check_version(Version(3, 0));
+ else if(check_version(Version(3, 30)))
+ return true;
+ else
+ return check_extension(ARB_explicit_attrib_location);
+}
+
+bool ProgramCompiler::LegacyConverter::supports_centroid_sampling() const
+{
+ if(target_api==OPENGL_ES2)
+ return check_version(Version(3, 0));
+ else if(check_version(Version(1, 20)))
+ return true;
+ else
+ return check_extension(EXT_gpu_shader4);
+}
+
+bool ProgramCompiler::LegacyConverter::supports_sample_sampling() const
+{
+ if(target_api==OPENGL_ES2)
+ return check_version(Version(3, 20));
+ else if(check_version(Version(4, 0)))
+ return true;
else
- return check_version(Version(3, 30));
+ return check_extension(ARB_gpu_shader5);
}
void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
}
else if(stage->type==FRAGMENT && var.interface=="out")
{
+ if(location!=0)
+ static Require _req(EXT_gpu_shader4);
stage->locations[var.name] = location;
var.layout->qualifiers.erase(i);
}
}
}
+ if(var.sampling=="centroid")
+ {
+ if(!supports_centroid_sampling())
+ var.sampling = string();
+ }
+ else if(var.sampling=="sample")
+ {
+ if(!supports_sample_sampling())
+ var.sampling = string();
+ }
+
if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax())
{
if(stage->type==FRAGMENT && var.interface=="out")
else
return check_version(Version(3, 20));
}
+ else if(check_version(Version(1, 50)))
+ return true;
+ else if(iface=="uniform")
+ return check_extension(ARB_uniform_buffer_object);
else
- return check_version(Version(1, 50));
+ return false;
}
void ProgramCompiler::LegacyConverter::visit(InterfaceBlock &iface)
projects / libs / gl.git / blobdiff