]> git.tdb.fi Git - libs/gl.git/blobdiff - source/programcompiler.cpp
Remove the deprecated ProgramBuilder class
[libs/gl.git] / source / programcompiler.cpp
index 0e749c9736588ddaa5192d74a70fb9719dc16f05..d021ab4f75732769855e9370fe0c8eec990aca20 100644 (file)
@@ -1,5 +1,12 @@
+#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"
@@ -39,48 +48,108 @@ ProgramCompiler::ProgramCompiler():
        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;
@@ -106,13 +175,49 @@ Stage *ProgramCompiler::get_builtins(StageType type)
        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(); )
@@ -122,50 +227,37 @@ void ProgramCompiler::process()
                else
                        ++i;
        }
+       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+               finalize(*i);
 }
 
 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<FunctionResolver>(stage);
        apply<VariableResolver>(stage);
        apply<InterfaceGenerator>(stage);
        apply<VariableResolver>(stage);
-       apply<VariableRenamer>(stage);
        apply<DeclarationReorderer>(stage);
+       apply<FunctionResolver>(stage);
        apply<LegacyConverter>(stage);
 }
 
@@ -184,10 +276,18 @@ bool ProgramCompiler::optimize(Stage &stage)
        return !unused.empty();
 }
 
+void ProgramCompiler::finalize(Stage &stage)
+{
+       if(get_gl_api()==OPENGL_ES2)
+               apply<DefaultPrecisionGenerator>(stage);
+       else
+               apply<PrecisionRemover>(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());
 }
 
@@ -219,140 +319,221 @@ void ProgramCompiler::Visitor::apply(Stage &s)
 }
 
 
+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)
 {
+       GLApi api = get_gl_api();
        const Version &ver = s.required_version;
-       if(ver.major)
-               formatted += format("#version %d%d\n", ver.major, ver.minor);
+
+       if(ver)
+       {
+               append(format("#version %d%02d", ver.major, ver.minor));
+               if(api==OPENGL_ES2 && ver>=Version(3, 0))
+                       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)
+{
+       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)
@@ -360,102 +541,156 @@ 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)
-               formatted += format("%s ", var.interface);
-       formatted += format("%s %s", var.type, var.name);
+       {
+               string interface = var.interface;
+               if(stage->required_version<Version(1, 30))
+               {
+                       if(stage->type==VERTEX && var.interface=="in")
+                               interface = "attribute";
+                       else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
+                               interface = "varying";
+               }
+               append(format("%s ", interface));
+       }
+       if(!var.precision.empty())
+               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)
+{
+       append(jump.keyword);
+       append(';');
 }
 
 
 ProgramCompiler::DeclarationCombiner::DeclarationCombiner():
-       toplevel(true),
-       remove_node(false)
+       toplevel(true)
 { }
 
 void ProgramCompiler::DeclarationCombiner::visit(Block &block)
@@ -464,15 +699,7 @@ 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)
@@ -497,6 +724,27 @@ void ProgramCompiler::DeclarationCombiner::visit(VariableDeclaration &var)
                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
@@ -672,38 +920,6 @@ void ProgramCompiler::FunctionResolver::visit(FunctionDeclaration &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)
 { }
@@ -730,7 +946,7 @@ void ProgramCompiler::InterfaceGenerator::apply(Stage &s)
 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);
 
@@ -738,7 +954,7 @@ void ProgramCompiler::InterfaceGenerator::visit(Block &block)
                {
                        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();
@@ -779,7 +995,7 @@ bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration
        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;
@@ -790,7 +1006,10 @@ void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left,
 
        ExpressionStatement *stmt = new ExpressionStatement;
        stmt->expression = assign;
+       stmt->visit(*this);
        insert_nodes.push_back(stmt);
+
+       return *stmt;
 }
 
 void ProgramCompiler::InterfaceGenerator::visit(VariableReference &var)
@@ -805,7 +1024,10 @@ 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)
@@ -818,7 +1040,12 @@ 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")
@@ -907,30 +1134,33 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
 }
 
 
-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);
@@ -952,13 +1182,64 @@ void ProgramCompiler::DeclarationReorderer::visit(Block &block)
                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)
@@ -1014,7 +1295,7 @@ 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)
+       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
        {
                (*i)->visit(*this);
                if(extract_result)
@@ -1035,9 +1316,15 @@ void ProgramCompiler::FunctionInliner::visit(BinaryExpression &binary)
        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;
@@ -1053,6 +1340,13 @@ void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
                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);
@@ -1153,7 +1447,8 @@ void ProgramCompiler::ExpressionEvaluator::visit(BinaryExpression &binary)
 
 
 ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
-       scope_level(0)
+       scope_level(0),
+       record_only(false)
 { }
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
@@ -1165,6 +1460,13 @@ 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);
@@ -1178,66 +1480,89 @@ void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &va
 
 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);
 }
 
 
 ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
        aggregate(0),
        assignment(0),
-       assignment_target(false)
+       assignment_target(false),
+       assign_to_subscript(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;
        }
 }
 
@@ -1251,6 +1576,8 @@ void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 {
        if(binary.oper=="[")
        {
+               if(assignment_target)
+                       assign_to_subscript = true;
                binary.left->visit(*this);
                SetForScope<bool> set(assignment_target, false);
                binary.right->visit(*this);
@@ -1262,6 +1589,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
 {
        {
+               assign_to_subscript = false;
                SetForScope<bool> set(assignment_target, !assign.self_referencing);
                assign.left->visit(*this);
        }
@@ -1269,16 +1597,23 @@ void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
        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)
 {
-       unused_nodes.insert(&node);
-       BlockAssignmentMap &block_assignments = assignments.back();
-       AssignmentList &var_assignments = block_assignments[&var];
-       if(!self_ref)
-               var_assignments.nodes.clear();
-       var_assignments.nodes.push_back(&node);
-       var_assignments.conditional = false;
-       var_assignments.self_referencing = self_ref;
+       VariableInfo &var_info = variables.back()[&var];
+       if(!chained)
+               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)
@@ -1286,7 +1621,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
        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)
@@ -1302,7 +1637,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var)
                aggregates[&var] = aggregate;
        else
        {
-               unused_nodes.insert(&var);
+               variables.back()[&var].local = true;
                if(var.init_expression)
                        record_assignment(var, *var.init_expression, false);
        }
@@ -1319,90 +1654,106 @@ void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
 
 void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
 {
-       assignments.push_back(BlockAssignmentMap());
-
-       for(vector<RefPtr<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(NodeArray<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(NodeArray<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, i->first->interface!="out");
+                       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);
@@ -1416,7 +1767,7 @@ void ProgramCompiler::UnusedFunctionLocator::visit(FunctionDeclaration &func)
 {
        TraversingVisitor::visit(func);
 
-       if(func.name!="main" && !used_definitions.count(&func))
+       if((func.name!="main" || func.body.body.empty()) && !used_definitions.count(&func))
                unused_nodes.insert(&func);
 }
 
@@ -1427,7 +1778,7 @@ ProgramCompiler::NodeRemover::NodeRemover(const set<Node *> &r):
 
 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()))
@@ -1451,16 +1802,86 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
                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 &)
+{
+       remove_node = true;
+}
+
+void ProgramCompiler::PrecisionRemover::visit(VariableDeclaration &var)
+{
+       var.precision.clear();
+}
+
+
+ProgramCompiler::DefaultPrecisionGenerator::DefaultPrecisionGenerator():
+       toplevel(true)
+{ }
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(Block &block)
+{
+       if(toplevel)
+       {
+               SetForScope<bool> set(toplevel, false);
+               BlockModifier::visit(block);
+       }
+       else
+               Visitor::visit(block);
+}
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(Precision &prec)
+{
+       have_default.insert(prec.type);
+}
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(VariableDeclaration &var)
+{
+       if(var.type_declaration)
+               return;
+
+       string type = var.type;
+       if(!type.compare(0, 3, "vec") || !type.compare(0, 3, "mat"))
+               type = "float";
+       else if(!type.compare(0, 3, "ivec") || type=="uint")
+               type = "int";
+
+       if(!have_default.count(type))
+       {
+               Precision *prec = new Precision;
+               if(!type.compare(0, 7, "sampler"))
+                       prec->precision = "lowp";
+               else if(stage->type==FRAGMENT)
+                       prec->precision = "mediump";
+               else
+                       prec->precision = "highp";
+               prec->type = type;
+               insert_nodes.push_back(prec);
+
+               have_default.insert(type);
+       }
+}
+
 
 ProgramCompiler::LegacyConverter::LegacyConverter():
-       target_version(get_glsl_version())
+       target_api(get_gl_api()),
+       target_version(get_glsl_version()),
+       frag_out(0)
 { }
 
 ProgramCompiler::LegacyConverter::LegacyConverter(const Version &v):
-       target_version(v)
+       target_api(get_gl_api()),
+       target_version(v),
+       frag_out(0)
 { }
 
-bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_version)
+bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_version) const
 {
        if(target_version<feature_version)
                return false;
@@ -1470,9 +1891,29 @@ bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_vers
        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)
+               return check_version(Version(3, 0));
+       else
+               return check_version(Version(1, 30));
+}
+
 void ProgramCompiler::LegacyConverter::visit(VariableReference &var)
 {
-       if(var.name==frag_out_name && !check_version(Version(1, 30)))
+       if(var.declaration==frag_out && !supports_unified_interface_syntax())
        {
                var.name = "gl_FragColor";
                var.declaration = 0;
@@ -1484,11 +1925,26 @@ void ProgramCompiler::LegacyConverter::visit(VariableReference &var)
                type = string();
 }
 
+void ProgramCompiler::LegacyConverter::visit(Assignment &assign)
+{
+       TraversingVisitor::visit(assign);
+       if(assign.target_declaration==frag_out && !supports_unified_interface_syntax())
+               assign.target_declaration = 0;
+}
+
+bool ProgramCompiler::LegacyConverter::supports_unified_sampling_functions() const
+{
+       if(target_api==OPENGL_ES2)
+               return check_version(Version(3, 0));
+       else
+               return check_version(Version(1, 30));
+}
+
 void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
 {
-       if(call.name=="texture" && !call.declaration && !check_version(Version(1, 30)))
+       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);
@@ -1498,10 +1954,32 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
                                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);
@@ -1511,9 +1989,39 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
                TraversingVisitor::visit(call);
 }
 
+bool ProgramCompiler::LegacyConverter::supports_interface_layouts() const
+{
+       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_extension(ARB_gpu_shader5);
+}
+
 void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
 {
-       if(var.layout && !check_version(Version(3, 30)))
+       if(var.layout && !supports_interface_layouts())
        {
                vector<Layout::Qualifier>::iterator i;
                for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->identifier!="location"); ++i) ;
@@ -1527,6 +2035,8 @@ 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);
                        }
@@ -1536,15 +2046,22 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
                }
        }
 
-       if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30)))
+       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==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")
+               if(stage->type==FRAGMENT && var.interface=="out")
                {
-                       frag_out_name = var.name;
+                       frag_out = &var;
                        remove_node = true;
                }
        }
@@ -1552,9 +2069,26 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
        TraversingVisitor::visit(var);
 }
 
+bool ProgramCompiler::LegacyConverter::supports_interface_blocks(const string &iface) const
+{
+       if(target_api==OPENGL_ES2)
+       {
+               if(iface=="uniform")
+                       return check_version(Version(3, 0));
+               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 false;
+}
+
 void ProgramCompiler::LegacyConverter::visit(InterfaceBlock &iface)
 {
-       if(!check_version(Version(1, 50)))
+       if(!supports_interface_blocks(iface.interface))
                flatten_block(iface.members);
 }