]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/compiler.cpp
Use default member initializers for simple types
[libs/gl.git] / source / glsl / compiler.cpp
index b862ef20d989e4c6904304b19b0d021738353704..506fba1c417c62657ee98292febc5102a5a752cd 100644 (file)
@@ -1,48 +1,35 @@
 #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 "builtin.h"
 #include "compiler.h"
-#include "shader.h"
+#include "debug.h"
+#include "deviceinfo.h"
+#include "error.h"
+#include "finalize.h"
+#include "generate.h"
+#include "glsl_error.h"
+#include "modulecache.h"
+#include "optimize.h"
+#include "output.h"
+#include "resolve.h"
+#include "spirv.h"
+#include "validate.h"
 
 #undef interface
 
 using namespace std;
 
-namespace {
-
-const char builtins_src[] =
-       "#pragma MSP stage(vertex)\n"
-       "out gl_PerVertex {\n"
-       "  vec4 gl_Position;\n"
-       "  float gl_ClipDistance[];\n"
-       "};\n"
-       "#pragma MSP stage(geometry)\n"
-       "in gl_PerVertex {\n"
-       "  vec4 gl_Position;\n"
-       "  float gl_ClipDistance[];\n"
-       "} gl_in[];\n"
-       "out gl_PerVertex {\n"
-       "  vec4 gl_Position;\n"
-       "  float gl_ClipDistance[];\n"
-       "};\n";
-
-}
-
 namespace Msp {
 namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-       resources(0),
-       module(0)
+       features(DeviceInfo::get_global().glsl_features)
+{ }
+
+Compiler::Compiler(const Features &f):
+       features(f)
 { }
 
 Compiler::~Compiler()
@@ -50,2043 +37,369 @@ Compiler::~Compiler()
        delete module;
 }
 
-void Compiler::compile(const string &source, const string &src_name)
+void Compiler::clear()
 {
-       resources = 0;
        delete module;
        module = new Module();
-       Parser parser;
-       imported_names.push_back(src_name);
-       append_module(parser.parse(source, src_name, 1));
-       process();
+       imported_names.clear();
+       module->source_map.set_name(0, "<generated>");
 }
 
-void Compiler::compile(IO::Base &io, Resources *res, const string &src_name)
+void Compiler::set_source(const string &source, const string &src_name)
 {
-       resources = res;
-       delete module;
-       module = new Module();
-       Parser parser;
+       clear();
        imported_names.push_back(src_name);
-       append_module(parser.parse(io, src_name, 1));
-       process();
+       ModuleCache mod_cache(0);
+       append_module(mod_cache.add_module(source, src_name), mod_cache);
 }
 
-void Compiler::compile(IO::Base &io, const string &src_name)
+void Compiler::load_source(IO::Base &io, DataFile::Collection *res, const string &src_name)
 {
-       compile(io, 0, src_name);
+       clear();
+       imported_names.push_back(src_name);
+       ModuleCache mod_cache(res);
+       append_module(mod_cache.add_module(io, src_name), mod_cache);
 }
 
-void Compiler::add_shaders(Program &program)
+void Compiler::load_source(IO::Base &io, const string &src_name)
 {
-       if(!module)
-               throw invalid_operation("Compiler::add_shaders");
-
-       try
-       {
-               for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               {
-                       if(i->type==VERTEX)
-                       {
-                               program.attach_shader_owned(new VertexShader(apply<Formatter>(*i)));
-                               for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
-                                       program.bind_attribute(j->second, j->first);
-                       }
-                       else if(i->type==GEOMETRY)
-                               program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
-                       else if(i->type==FRAGMENT)
-                       {
-                               program.attach_shader_owned(new FragmentShader(apply<Formatter>(*i)));
-                               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);
-                               }
-                       }
-               }
-       }
-       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)
-               {
-                       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);
-       }
+       load_source(io, 0, src_name);
 }
 
-Module *Compiler::create_builtins_module()
+void Compiler::specialize(const map<string, int> &sv)
 {
-       Parser parser;
-       Module *module = new Module(parser.parse(builtins_src, "<builtin>"));
-       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-       {
-               VariableResolver resolver;
-               i->content.visit(resolver);
-               for(map<string, VariableDeclaration *>::iterator j=i->content.variables.begin(); j!=i->content.variables.end(); ++j)
-                       j->second->linked_declaration = j->second;
-       }
-       return module;
+       specialized = true;
+       spec_values = sv;
 }
 
-Module &Compiler::get_builtins_module()
+void Compiler::compile(Mode mode)
 {
-       static RefPtr<Module> builtins_module = create_builtins_module();
-       return *builtins_module;
-}
+       if(specialized && mode!=PROGRAM)
+               throw invalid_operation("Compiler::compile");
 
-Stage *Compiler::get_builtins(StageType type)
-{
-       Module &module = get_builtins_module();
-       for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
-               if(i->type==type)
-                       return &*i;
-       return 0;
-}
+       for(Stage &s: module->stages)
+               generate(s);
+       ConstantIdAssigner().apply(*module, features);
 
-void Compiler::append_module(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()));
+       for(Stage &s: module->stages)
+               validate(s);
+       GlobalInterfaceValidator().apply(*module);
 
-       append_stage(mod.shared);
-       for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
-               append_stage(*i);
-}
+       bool valid = true;
+       for(Stage &s: module->stages)
+               if(!check_errors(s))
+                       valid = false;
+       if(!valid)
+               throw invalid_shader_source(get_diagnostics());
 
-void Compiler::append_stage(Stage &stage)
-{
-       Stage *target = 0;
-       if(stage.type==SHARED)
-               target = &module->shared;
-       else
+       if(specialized)
        {
-               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;
+               for(Stage &s: module->stages)
+                       ConstantSpecializer().apply(s, spec_values);
        }
-
-       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 Compiler::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(); )
+       for(auto i=module->stages.begin(); i!=module->stages.end(); )
        {
-               if(optimize(*i))
+               OptimizeResult result = optimize(*i);
+               if(result==REDO_PREVIOUS)
                        i = module->stages.begin();
-               else
+               else if(result!=REDO_STAGE)
                        ++i;
        }
-       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               finalize(*i);
-}
-
-void Compiler::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));
-       Parser import_parser;
-       append_module(import_parser.parse(*io, fn, imported_names.size()));
-}
-
-void Compiler::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<DeclarationReorderer>(stage);
-       apply<FunctionResolver>(stage);
-       apply<LegacyConverter>(stage);
-}
-
-bool Compiler::optimize(Stage &stage)
-{
-       apply<ConstantConditionEliminator>(stage);
-
-       set<FunctionDeclaration *> inlineable = apply<InlineableFunctionLocator>(stage);
-       apply<FunctionInliner>(stage, inlineable);
-
-       set<Node *> unused = apply<UnusedVariableLocator>(stage);
-       set<Node *> unused2 = apply<UnusedFunctionLocator>(stage);
-       unused.insert(unused2.begin(), unused2.end());
-       apply<NodeRemover>(stage, unused);
-
-       return !unused.empty();
-}
-
-void Compiler::finalize(Stage &stage)
-{
-       if(get_gl_api()==OPENGL_ES2)
-               apply<DefaultPrecisionGenerator>(stage);
-       else
-               apply<PrecisionRemover>(stage);
-}
-
-void Compiler::inject_block(Block &target, const Block &source)
-{
-       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());
-}
-
-template<typename T>
-typename T::ResultType Compiler::apply(Stage &stage)
-{
-       T visitor;
-       visitor.apply(stage);
-       return visitor.get_result();
-}
-
-template<typename T, typename A>
-typename T::ResultType Compiler::apply(Stage &stage, const A &arg)
-{
-       T visitor(arg);
-       visitor.apply(stage);
-       return visitor.get_result();
-}
-
-
-Compiler::Visitor::Visitor():
-       stage(0)
-{ }
-
-void Compiler::Visitor::apply(Stage &s)
-{
-       SetForScope<Stage *> set(stage, &s);
-       stage->content.visit(*this);
-}
-
-
-Compiler::BlockModifier::BlockModifier():
-       remove_node(false)
-{ }
-
-void Compiler::BlockModifier::flatten_block(Block &block)
-{
-       insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
-       remove_node = true;
-}
-
-void Compiler::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 Compiler::BlockModifier::visit(Block &block)
-{
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-       {
-               (*i)->visit(*this);
-               apply_and_increment(block, i);
-       }
-}
-
-
-Compiler::Formatter::Formatter():
-       source_index(0),
-       source_line(1),
-       indent(0),
-       parameter_list(false)
-{ }
-
-void Compiler::Formatter::apply(Stage &s)
-{
-       GLApi api = get_gl_api();
-       const Version &ver = s.required_version;
-
-       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';
+       LocationAllocator().apply(*module, features);
+       for(Stage &s: module->stages)
+               finalize(s, mode);
 
-       Visitor::apply(s);
+       compiled = true;
 }
 
-void Compiler::Formatter::append(const string &text)
+string Compiler::get_combined_glsl() const
 {
-       formatted += text;
-       for(string::const_iterator i=text.begin(); i!=text.end(); ++i)
-               if(*i=='\n')
-                       ++source_line;
-}
+       if(!compiled)
+               throw invalid_operation("Compiler::get_combined_glsl");
 
-void Compiler::Formatter::append(char c)
-{
-       formatted += c;
-       if(c=='\n')
-               ++source_line;
-}
+       string glsl;
 
-void Compiler::Formatter::set_source(unsigned index, unsigned line)
-{
-       if(index!=source_index || (index && line!=source_line))
+       unsigned source_count = module->source_map.get_count();
+       for(unsigned i=1; i<source_count; ++i)
+               glsl += format("#pragma MSP source(%d, \"%s\")\n", i, module->source_map.get_name(i));
+       for(Stage &s: module->stages)
        {
-               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);
-               }
+               glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(s.type));
+               glsl += Formatter().apply(s);
+               glsl += '\n';
        }
-       source_index = index;
-       source_line = line;
-}
-
-void Compiler::Formatter::visit(Literal &literal)
-{
-       append(literal.token);
-}
-
-void Compiler::Formatter::visit(ParenthesizedExpression &parexpr)
-{
-       append('(');
-       parexpr.expression->visit(*this);
-       append(')');
-}
-
-void Compiler::Formatter::visit(VariableReference &var)
-{
-       append(var.name);
-}
 
-void Compiler::Formatter::visit(MemberAccess &memacc)
-{
-       memacc.left->visit(*this);
-       append(format(".%s", memacc.member));
+       return glsl;
 }
 
-void Compiler::Formatter::visit(UnaryExpression &unary)
+vector<Stage::Type> Compiler::get_stages() const
 {
-       if(unary.prefix)
-               append(unary.oper);
-       unary.expression->visit(*this);
-       if(!unary.prefix)
-               append(unary.oper);
+       vector<Stage::Type> stage_types;
+       stage_types.reserve(module->stages.size());
+       for(const Stage &s: module->stages)
+               stage_types.push_back(s.type);
+       return stage_types;
 }
 
-void Compiler::Formatter::visit(BinaryExpression &binary)
+string Compiler::get_stage_glsl(Stage::Type stage_type) const
 {
-       binary.left->visit(*this);
-       append(binary.oper);
-       binary.right->visit(*this);
-       append(binary.after);
+       if(!compiled)
+               throw invalid_operation("Compiler::get_stage_glsl");
+       auto i = find_member(module->stages, stage_type, &Stage::type);
+       if(i!=module->stages.end())
+               return Formatter().apply(*i);
+       throw key_error(Stage::get_stage_name(stage_type));
 }
 
-void Compiler::Formatter::visit(Assignment &assign)
+vector<uint32_t> Compiler::get_combined_spirv() const
 {
-       assign.left->visit(*this);
-       append(format(" %s ", assign.oper));
-       assign.right->visit(*this);
+       if(!compiled)
+               throw invalid_operation("Compiler::get_combined_spirv");
+       SpirVGenerator gen;
+       gen.apply(*module);
+       return gen.get_code();
 }
 
-void Compiler::Formatter::visit(FunctionCall &call)
+const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
-       append(format("%s(", call.name));
-       for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-       {
-               if(i!=call.arguments.begin())
-                       append(", ");
-               (*i)->visit(*this);
-       }
-       append(')');
+       if(!compiled)
+               throw invalid_operation("Compiler::get_vertex_attributes");
+       auto i = find_member(module->stages, Stage::VERTEX, &Stage::type);
+       if(i!=module->stages.end())
+               return i->locations;
+       throw invalid_operation("Compiler::get_vertex_attributes");
 }
 
-void Compiler::Formatter::visit(ExpressionStatement &expr)
+const map<string, unsigned> &Compiler::get_fragment_outputs() const
 {
-       expr.expression->visit(*this);
-       append(';');
+       if(!compiled)
+               throw invalid_operation("Compiler::get_fragment_outputs");
+       auto i = find_member(module->stages, Stage::FRAGMENT, &Stage::type);
+       if(i!=module->stages.end())
+               return i->locations;
+       throw invalid_operation("Compiler::get_fragment_outputs");
 }
 
-void Compiler::Formatter::visit(Block &block)
+const map<string, unsigned> &Compiler::get_texture_bindings() const
 {
-       unsigned brace_indent = indent;
-       bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
-       if(use_braces)
-               append(format("%s{\n", string(brace_indent*2, ' ')));
-
-       SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
-       string spaces(indent*2, ' ');
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
-       {
-               if(i!=block.body.begin())
-                       append('\n');
-               set_source((*i)->source, (*i)->line);
-               append(spaces);
-               (*i)->visit(*this);
-       }
-
-       if(use_braces)
-               append(format("\n%s}", string(brace_indent*2, ' ')));
+       if(!compiled)
+               throw invalid_operation("Compiler::get_texture_bindings");
+       return module->shared.texture_bindings;
 }
 
-void Compiler::Formatter::visit(Import &import)
+const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
 {
-       append(format("import %s;", import.module));
+       if(!compiled)
+               throw invalid_operation("Compiler::get_uniform_block_bindings");
+       return module->shared.uniform_block_bindings;
 }
 
-void Compiler::Formatter::visit(Precision &prec)
+const SourceMap &Compiler::get_source_map() const
 {
-       append(format("precision %s %s;", prec.precision, prec.type));
+       return module->source_map;
 }
 
-void Compiler::Formatter::visit(Layout &layout)
+string Compiler::get_stage_debug(Stage::Type stage_type) const
 {
-       append("layout(");
-       for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
-       {
-               if(i!=layout.qualifiers.begin())
-                       append(", ");
-               append(i->identifier);
-               if(!i->value.empty())
-                       append(format("=%s", i->value));
-       }
-       append(')');
+       auto i = find_member(module->stages, stage_type, &Stage::type);
+       if(i!=module->stages.end())
+               return DumpTree().apply(*i);
+       throw key_error(Stage::get_stage_name(stage_type));
 }
 
-void Compiler::Formatter::visit(InterfaceLayout &layout)
+string Compiler::get_diagnostics() const
 {
-       layout.layout.visit(*this);
-       append(format(" %s;", layout.interface));
+       string combined;
+       for(const Stage &s: module->stages)
+               for(const Diagnostic &d: s.diagnostics)
+                       if(d.source!=INTERNAL_SOURCE)
+                               append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(d.source), d.line, d.message));
+       return combined;
 }
 
-void Compiler::Formatter::visit(StructDeclaration &strct)
+void Compiler::append_module(const Module &mod, ModuleCache &mod_cache)
 {
-       append(format("struct %s\n", strct.name));
-       strct.members.visit(*this);
-       append(';');
-}
+       module->source_map.merge_from(mod.source_map);
 
-void Compiler::Formatter::visit(VariableDeclaration &var)
-{
-       if(var.layout)
-       {
-               var.layout->visit(*this);
-               append(' ');
-       }
-       if(var.constant)
-               append("const ");
-       if(!var.interpolation.empty())
-               append(format("%s ", var.interpolation));
-       if(!var.sampling.empty())
-               append(format("%s ", var.sampling));
-       if(!var.interface.empty() && var.interface!=block_interface)
-       {
-               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)
-       {
-               append('[');
-               if(var.array_size)
-                       var.array_size->visit(*this);
-               append(']');
-       }
-       if(var.init_expression)
-       {
-               append(" = ");
-               var.init_expression->visit(*this);
-       }
-       if(!parameter_list)
-               append(';');
-}
+       vector<Import *> imports;
+       for(const RefPtr<Statement> &s: mod.shared.content.body)
+               if(Import *imp = dynamic_cast<Import *>(s.get()))
+                       imports.push_back(imp);
+       for(Import *i: imports)
+               import(mod_cache, i->module);
 
-void Compiler::Formatter::visit(InterfaceBlock &iface)
-{
-       SetForScope<string> set(block_interface, iface.interface);
-       append(format("%s %s\n", iface.interface, iface.name));
-       iface.members.visit(*this);
-       append(';');
+       append_stage(mod.shared);
+       for(const Stage &s: mod.stages)
+               append_stage(s);
 }
 
-void Compiler::Formatter::visit(FunctionDeclaration &func)
+void Compiler::append_stage(const Stage &stage)
 {
-       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())
-                       append(", ");
-               SetFlag set(parameter_list);
-               (*i)->visit(*this);
-       }
-       append(')');
-       if(func.definition==&func)
-       {
-               append('\n');
-               func.body.visit(*this);
-       }
+       Stage *target = 0;
+       if(stage.type==Stage::SHARED)
+               target = &module->shared;
        else
-               append(';');
-}
-
-void Compiler::Formatter::visit(Conditional &cond)
-{
-       append("if(");
-       cond.condition->visit(*this);
-       append(")\n");
-
-       cond.body.visit(*this);
-       if(!cond.else_body.body.empty())
        {
-               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
+               auto i = find_if(module->stages, [&stage](const Stage &s){ return s.type>=stage.type; });
+               if(i==module->stages.end() || i->type>stage.type)
                {
-                       append(format("\n%selse\n", string(indent*2, ' ')));
-                       cond.else_body.visit(*this);
+                       auto 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;
                }
-       }
-}
 
-void Compiler::Formatter::visit(Iteration &iter)
-{
-       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(')');
+               target = &*i;
        }
 
-       if(iter.body.body.empty())
-               append(" { }");
-       else
-       {
-               append('\n');
-               iter.body.visit(*this);
-       }
+       if(stage.required_features.glsl_version>target->required_features.glsl_version)
+               target->required_features.glsl_version = stage.required_features.glsl_version;
+       for(const RefPtr<Statement> &s: stage.content.body)
+               if(!dynamic_cast<Import *>(s.get()))
+                       target->content.body.push_back(s);
 }
 
-void Compiler::Formatter::visit(Return &ret)
+void Compiler::import(ModuleCache &mod_cache, const string &name)
 {
-       append("return");
-       if(ret.expression)
-       {
-               append(' ');
-               ret.expression->visit(*this);
-       }
-       append(';');
-}
+       if(find(imported_names, name)!=imported_names.end())
+               return;
+       imported_names.push_back(name);
 
-void Compiler::Formatter::visit(Jump &jump)
-{
-       append(jump.keyword);
-       append(';');
+       append_module(mod_cache.get_module(name), mod_cache);
 }
 
+void Compiler::generate(Stage &stage)
+{
+       stage.required_features.target_api = features.target_api;
+       if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
+               stage.required_features.glsl_version = module->shared.required_features.glsl_version;
 
-Compiler::DeclarationCombiner::DeclarationCombiner():
-       toplevel(true)
-{ }
+       inject_block(stage.content, module->shared.content);
+       if(const Stage *builtins = get_builtins(stage.type))
+               inject_block(stage.content, builtins->content);
+       if(const Stage *builtins = get_builtins(Stage::SHARED))
+               inject_block(stage.content, builtins->content);
 
-void Compiler::DeclarationCombiner::visit(Block &block)
-{
-       if(!toplevel)
-               return;
+       // Initial resolving pass
+       resolve(stage);
 
-       SetForScope<bool> set(toplevel, false);
-       BlockModifier::visit(block);
+       /* All variables local to a stage have been resolved.  Resolve non-local
+       variables through interfaces. */
+       InterfaceGenerator().apply(stage);
+       resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
 }
 
-void Compiler::DeclarationCombiner::visit(FunctionDeclaration &func)
+template<typename T>
+bool Compiler::resolve(Stage &stage, unsigned &flags, unsigned bit)
 {
-       vector<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
-       {
-               for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
-               {
-                       (*i)->definition = func.definition;
-                       (*i)->body.body.clear();
-               }
-       }
-       decls.push_back(&func);
+       if(!(flags&bit))
+               return false;
+
+       flags &= ~bit;
+       return T().apply(stage);
 }
 
-void Compiler::DeclarationCombiner::visit(VariableDeclaration &var)
+void Compiler::resolve(Stage &stage, unsigned flags)
 {
-       VariableDeclaration *&ptr = variables[var.name];
-       if(ptr)
+       while(flags)
        {
-               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;
+               if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
+                       ;
+               else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
+                       flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+               else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
+                       flags |= RESOLVE_EXPRESSIONS;
+               else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
+                       flags |= RESOLVE_EXPRESSIONS;
+               else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
+                       flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
        }
-       else
-               ptr = &var;
-}
-
-
-Compiler::VariableResolver::VariableResolver():
-       anonymous(false),
-       record_target(false),
-       assignment_target(0),
-       self_referencing(false)
-{ }
-
-void Compiler::VariableResolver::apply(Stage &s)
-{
-       SetForScope<Stage *> set(stage, &s);
-       Stage *builtins = get_builtins(stage->type);
-       if(builtins)
-               blocks.push_back(&builtins->content);
-       stage->content.visit(*this);
-       if(builtins)
-               blocks.pop_back();
 }
 
-void Compiler::VariableResolver::visit(Block &block)
+void Compiler::validate(Stage &stage)
 {
-       blocks.push_back(&block);
-       block.variables.clear();
-       TraversingVisitor::visit(block);
-       blocks.pop_back();
+       DeclarationValidator().apply(stage);
+       IdentifierValidator().apply(stage);
+       ReferenceValidator().apply(stage);
+       ExpressionValidator().apply(stage);
+       FlowControlValidator().apply(stage);
+       StageInterfaceValidator().apply(stage);
 }
 
-void Compiler::VariableResolver::visit(VariableReference &var)
+bool Compiler::check_errors(Stage &stage)
 {
-       var.declaration = 0;
-       type = 0;
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
-       {
-               --i;
-               map<string, VariableDeclaration *>::iterator j = (*i)->variables.find(var.name);
-               if(j!=(*i)->variables.end())
-               {
-                       var.declaration = j->second;
-                       type = j->second->type_declaration;
-                       break;
-               }
-       }
-
-       if(record_target)
-       {
-               if(assignment_target)
-               {
-                       record_target = false;
-                       assignment_target = 0;
-               }
-               else
-                       assignment_target = var.declaration;
-       }
-       else if(var.declaration && var.declaration==assignment_target)
-               self_referencing = true;
+       stable_sort(stage.diagnostics, &diagnostic_line_order);
+       return !any_of(stage.diagnostics.begin(), stage.diagnostics.end(),
+               [](const Diagnostic &d){ return d.severity==Diagnostic::ERR; });
 }
 
-void Compiler::VariableResolver::visit(MemberAccess &memacc)
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
 {
-       type = 0;
-       TraversingVisitor::visit(memacc);
-       memacc.declaration = 0;
-       if(type)
+       if(diag1.provoking_source!=diag2.provoking_source)
        {
-               map<string, VariableDeclaration *>::iterator i = type->members.variables.find(memacc.member);
-               if(i!=type->members.variables.end())
-               {
-                       memacc.declaration = i->second;
-                       type = i->second->type_declaration;
-               }
+               // Sort builtins first and imported modules according to import order.
+               if(diag1.provoking_source<=BUILTIN_SOURCE)
+                       return diag1.provoking_source<diag2.provoking_source;
+               else if(diag2.provoking_source<=BUILTIN_SOURCE)
+                       return false;
                else
-                       type = 0;
+                       return diag1.provoking_source>diag2.provoking_source;
        }
+       return diag1.provoking_line<diag2.provoking_line;
 }
 
-void Compiler::VariableResolver::visit(BinaryExpression &binary)
+Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
-       if(binary.oper=="[")
-       {
-               {
-                       SetForScope<bool> set(record_target, false);
-                       binary.right->visit(*this);
-               }
-               type = 0;
-               binary.left->visit(*this);
-       }
-       else
-       {
-               TraversingVisitor::visit(binary);
-               type = 0;
-       }
-}
+       if(ConstantFolder().apply(stage))
+               resolve(stage, RESOLVE_EXPRESSIONS);
+       ConstantConditionEliminator().apply(stage);
 
-void Compiler::VariableResolver::visit(Assignment &assign)
-{
+       bool any_inlined = false;
+       if(FunctionInliner().apply(stage))
        {
-               SetFlag set(record_target);
-               assignment_target = 0;
-               assign.left->visit(*this);
+               resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+               any_inlined = true;
        }
-
-       self_referencing = false;
-       assign.right->visit(*this);
-
-       assign.self_referencing = (self_referencing || assign.oper!="=");
-       assign.target_declaration = assignment_target;
-}
-
-void Compiler::VariableResolver::visit(StructDeclaration &strct)
-{
-       TraversingVisitor::visit(strct);
-       blocks.back()->types[strct.name] = &strct;
-}
-
-void Compiler::VariableResolver::visit(VariableDeclaration &var)
-{
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+       if(ExpressionInliner().apply(stage))
        {
-               --i;
-               map<string, StructDeclaration *>::iterator j = (*i)->types.find(var.type);
-               if(j!=(*i)->types.end())
-                       var.type_declaration = j->second;
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+               any_inlined = true;
        }
 
-       if(!block_interface.empty() && var.interface.empty())
-               var.interface = block_interface;
-
-       TraversingVisitor::visit(var);
-       blocks.back()->variables[var.name] = &var;
-       if(anonymous && blocks.size()>1)
-               blocks[blocks.size()-2]->variables[var.name] = &var;
-}
-
-void Compiler::VariableResolver::visit(InterfaceBlock &iface)
-{
-       SetFlag set(anonymous);
-       SetForScope<string> set2(block_interface, iface.interface);
-       TraversingVisitor::visit(iface);
-}
-
-
-void Compiler::FunctionResolver::visit(FunctionCall &call)
-{
-       map<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
-       if(i!=functions.end())
-               call.declaration = i->second.back();
+       /* Removing variables or functions may cause things from the previous stage
+       to become unused. */
+       bool any_removed = UnreachableCodeRemover().apply(stage);
+       any_removed |= UnusedVariableRemover().apply(stage);
+       any_removed |= UnusedFunctionRemover().apply(stage);
+       any_removed |= UnusedTypeRemover().apply(stage);
 
-       TraversingVisitor::visit(call);
+       return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }
 
-void Compiler::FunctionResolver::visit(FunctionDeclaration &func)
+void Compiler::finalize(Stage &stage, Mode mode)
 {
-       vector<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
+       if(mode==PROGRAM)
        {
-               for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
-                       (*i)->definition = func.definition;
-               decls.clear();
-               decls.push_back(&func);
+               LegacyConverter().apply(stage, features);
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+               PrecisionConverter().apply(stage);
        }
-       else if(!decls.empty() && decls.back()->definition)
-               func.definition = decls.back()->definition;
-       else
-               decls.push_back(&func);
+       else if(mode==SPIRV)
+               StructOrganizer().apply(stage);
 
-       TraversingVisitor::visit(func);
+       // Collect bindings from all stages into the shared stage's maps
+       module->shared.texture_bindings.insert(stage.texture_bindings.begin(), stage.texture_bindings.end());
+       module->shared.uniform_block_bindings.insert(stage.uniform_block_bindings.begin(), stage.uniform_block_bindings.end());
 }
 
-
-Compiler::InterfaceGenerator::InterfaceGenerator():
-       scope_level(0)
-{ }
-
-string Compiler::InterfaceGenerator::get_out_prefix(StageType type)
-{
-       if(type==VERTEX)
-               return "_vs_out_";
-       else if(type==GEOMETRY)
-               return "_gs_out_";
-       else
-               return string();
-}
-
-void Compiler::InterfaceGenerator::apply(Stage &s)
-{
-       SetForScope<Stage *> set(stage, &s);
-       if(stage->previous)
-               in_prefix = get_out_prefix(stage->previous->type);
-       out_prefix = get_out_prefix(stage->type);
-       stage->content.visit(*this);
-}
-
-void Compiler::InterfaceGenerator::visit(Block &block)
-{
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-       {
-               (*i)->visit(*this);
-
-               if(scope_level==1)
-               {
-                       for(map<string, RefPtr<VariableDeclaration> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
-                       {
-                               NodeList<Statement>::iterator k = block.body.insert(i, j->second);
-                               (*k)->visit(*this);
-                       }
-                       iface_declarations.clear();
-               }
-
-               apply_and_increment(block, i);
-       }
-}
-
-string Compiler::InterfaceGenerator::change_prefix(const string &name, const string &prefix) const
-{
-       unsigned offset = (name.compare(0, in_prefix.size(), in_prefix) ? 0 : in_prefix.size());
-       return prefix+name.substr(offset);
-}
-
-bool Compiler::InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
-{
-       const map<string, VariableDeclaration *> &stage_vars = (iface=="in" ? stage->in_variables : stage->out_variables);
-       if(stage_vars.count(name) || iface_declarations.count(name))
-               return false;
-
-       VariableDeclaration* iface_var = new VariableDeclaration;
-       iface_var->sampling = var.sampling;
-       iface_var->interface = iface;
-       iface_var->type = var.type;
-       iface_var->type_declaration = var.type_declaration;
-       iface_var->name = name;
-       if(stage->type==GEOMETRY)
-               iface_var->array = ((var.array && var.interface!="in") || iface=="in");
-       else
-               iface_var->array = var.array;
-       if(iface_var->array)
-               iface_var->array_size = var.array_size;
-       if(iface=="in")
-               iface_var->linked_declaration = &var;
-       iface_declarations[name] = iface_var;
-
-       return true;
-}
-
-ExpressionStatement &Compiler::InterfaceGenerator::insert_assignment(const string &left, Expression *right)
-{
-       Assignment *assign = new Assignment;
-       VariableReference *ref = new VariableReference;
-       ref->name = left;
-       assign->left = ref;
-       assign->oper = "=";
-       assign->right = right;
-
-       ExpressionStatement *stmt = new ExpressionStatement;
-       stmt->expression = assign;
-       stmt->visit(*this);
-       insert_nodes.push_back(stmt);
-
-       return *stmt;
-}
-
-void Compiler::InterfaceGenerator::visit(VariableReference &var)
-{
-       if(var.declaration || !stage->previous)
-               return;
-       if(iface_declarations.count(var.name))
-               return;
-
-       const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-       map<string, VariableDeclaration *>::const_iterator i = prev_out.find(var.name);
-       if(i==prev_out.end())
-               i = prev_out.find(in_prefix+var.name);
-       if(i!=prev_out.end())
-       {
-               generate_interface(*i->second, "in", i->second->name);
-               var.name = i->second->name;
-       }
-}
-
-void Compiler::InterfaceGenerator::visit(VariableDeclaration &var)
-{
-       if(var.interface=="out")
-       {
-               if(scope_level==1)
-                       stage->out_variables[var.name] = &var;
-               else if(generate_interface(var, "out", change_prefix(var.name, string())))
-               {
-                       remove_node = true;
-                       if(var.init_expression)
-                       {
-                               ExpressionStatement &stmt = insert_assignment(var.name, var.init_expression->clone());
-                               stmt.source = var.source;
-                               stmt.line = var.line;
-                               return;
-                       }
-               }
-       }
-       else if(var.interface=="in")
-       {
-               stage->in_variables[var.name] = &var;
-               if(var.linked_declaration)
-                       var.linked_declaration->linked_declaration = &var;
-               else if(stage->previous)
-               {
-                       const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-                       map<string, VariableDeclaration *>::const_iterator i = prev_out.find(var.name);
-                       if(i!=prev_out.end())
-                       {
-                               var.linked_declaration = i->second;
-                               i->second->linked_declaration = &var;
-                       }
-               }
-       }
-
-       TraversingVisitor::visit(var);
-}
-
-void Compiler::InterfaceGenerator::visit(Passthrough &pass)
-{
-       vector<VariableDeclaration *> pass_vars;
-
-       for(map<string, VariableDeclaration *>::const_iterator i=stage->in_variables.begin(); i!=stage->in_variables.end(); ++i)
-               pass_vars.push_back(i->second);
-       for(map<string, RefPtr<VariableDeclaration> >::const_iterator i=iface_declarations.begin(); i!=iface_declarations.end(); ++i)
-               if(i->second->interface=="in")
-                       pass_vars.push_back(i->second.get());
-
-       if(stage->previous)
-       {
-               const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-               for(map<string, VariableDeclaration *>::const_iterator i=prev_out.begin(); i!=prev_out.end(); ++i)
-               {
-                       bool linked = false;
-                       for(vector<VariableDeclaration *>::const_iterator j=pass_vars.begin(); (!linked && j!=pass_vars.end()); ++j)
-                               linked = ((*j)->linked_declaration==i->second);
-
-                       if(!linked && generate_interface(*i->second, "in", i->second->name))
-                               pass_vars.push_back(i->second);
-               }
-       }
-
-       if(stage->type==GEOMETRY)
-       {
-               VariableReference *ref = new VariableReference;
-               ref->name = "gl_in";
-
-               BinaryExpression *subscript = new BinaryExpression;
-               subscript->left = ref;
-               subscript->oper = "[";
-               subscript->right = pass.subscript;
-               subscript->after = "]";
-
-               MemberAccess *memacc = new MemberAccess;
-               memacc->left = subscript;
-               memacc->member = "gl_Position";
-
-               insert_assignment("gl_Position", memacc);
-       }
-
-       for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
-       {
-               string out_name = change_prefix((*i)->name, out_prefix);
-               generate_interface(**i, "out", out_name);
-
-               VariableReference *ref = new VariableReference;
-               ref->name = (*i)->name;
-               if(pass.subscript)
-               {
-                       BinaryExpression *subscript = new BinaryExpression;
-                       subscript->left = ref;
-                       subscript->oper = "[";
-                       subscript->right = pass.subscript;
-                       subscript->after = "]";
-                       insert_assignment(out_name, subscript);
-               }
-               else
-                       insert_assignment(out_name, ref);
-       }
-
-       remove_node = true;
-}
-
-
-Compiler::DeclarationReorderer::DeclarationReorderer():
-       scope_level(0),
-       kind(NO_DECLARATION)
-{ }
-
-void Compiler::DeclarationReorderer::visit(FunctionCall &call)
-{
-       FunctionDeclaration *def = call.declaration;
-       if(def)
-               def = def->definition;
-       if(def && !ordered_funcs.count(def))
-               needed_funcs.insert(def);
-}
-
-void Compiler::DeclarationReorderer::visit(Block &block)
-{
-       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(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-       {
-               kind = NO_DECLARATION;
-               (*i)->visit(*this);
-
-               bool moved = false;
-               if(kind==STRUCT && struct_insert_point!=block.body.end())
-               {
-                       block.body.insert(struct_insert_point, *i);
-                       moved = true;
-               }
-               else if(kind>STRUCT && struct_insert_point==block.body.end())
-                       struct_insert_point = i;
-
-               if(kind==VARIABLE && variable_insert_point!=block.body.end())
-               {
-                       block.body.insert(variable_insert_point, *i);
-                       moved = true;
-               }
-               else if(kind>VARIABLE && variable_insert_point==block.body.end())
-                       variable_insert_point = i;
-
-               if(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 Compiler::DeclarationReorderer::visit(VariableDeclaration &var)
-{
-       Visitor::visit(var);
-       kind = VARIABLE;
-}
-
-void Compiler::DeclarationReorderer::visit(FunctionDeclaration &func)
-{
-       needed_funcs.clear();
-       func.body.visit(*this);
-       needed_funcs.erase(&func);
-       kind = FUNCTION;
-}
-
-
-Compiler::InlineableFunctionLocator::InlineableFunctionLocator():
-       in_function(0)
-{ }
-
-void Compiler::InlineableFunctionLocator::visit(FunctionCall &call)
-{
-       FunctionDeclaration *def = call.declaration;
-       if(def && def->definition!=def)
-               def = def->definition;
-
-       if(def)
-       {
-               unsigned &count = refcounts[def];
-               ++count;
-               if(count>1 || def==in_function)
-                       inlineable.erase(def);
-       }
-
-       TraversingVisitor::visit(call);
-}
-
-void Compiler::InlineableFunctionLocator::visit(FunctionDeclaration &func)
-{
-       unsigned &count = refcounts[func.definition];
-       if(!count && func.parameters.empty())
-               inlineable.insert(func.definition);
-
-       SetForScope<FunctionDeclaration *> set(in_function, &func);
-       TraversingVisitor::visit(func);
-}
-
-
-Compiler::FunctionInliner::FunctionInliner():
-       extract_result(0)
-{ }
-
-Compiler::FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
-       inlineable(in),
-       extract_result(0)
-{ }
-
-void Compiler::FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
-{
-       inline_result = 0;
-       ptr->visit(*this);
-       if(inline_result)
-               ptr = inline_result;
-}
-
-void Compiler::FunctionInliner::visit(Block &block)
-{
-       if(extract_result)
-               --extract_result;
-
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
-       {
-               (*i)->visit(*this);
-               if(extract_result)
-                       --extract_result;
-       }
-}
-
-void Compiler::FunctionInliner::visit(UnaryExpression &unary)
-{
-       visit_and_inline(unary.expression);
-       inline_result = 0;
-}
-
-void Compiler::FunctionInliner::visit(BinaryExpression &binary)
-{
-       visit_and_inline(binary.left);
-       visit_and_inline(binary.right);
-       inline_result = 0;
-}
-
-void Compiler::FunctionInliner::visit(MemberAccess &memacc)
-{
-       visit_and_inline(memacc.left);
-       inline_result = 0;
-}
-
-void Compiler::FunctionInliner::visit(FunctionCall &call)
-{
-       for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-               visit_and_inline(*i);
-
-       FunctionDeclaration *def = call.declaration;
-       if(def && def->definition!=def)
-               def = def->definition;
-
-       if(def && inlineable.count(def))
-       {
-               extract_result = 2;
-               def->visit(*this);
-       }
-       else
-               inline_result = 0;
-}
-
-void Compiler::FunctionInliner::visit(VariableDeclaration &var)
-{
-       if(var.init_expression)
-               visit_and_inline(var.init_expression);
-       inline_result = 0;
-}
-
-void Compiler::FunctionInliner::visit(Return &ret)
-{
-       TraversingVisitor::visit(ret);
-
-       if(extract_result)
-               inline_result = ret.expression->clone();
-}
-
-
-Compiler::ExpressionEvaluator::ExpressionEvaluator():
-       variable_values(0),
-       result(0.0f),
-       result_valid(false)
-{ }
-
-Compiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap &v):
-       variable_values(&v),
-       result(0.0f),
-       result_valid(false)
-{ }
-
-void Compiler::ExpressionEvaluator::visit(Literal &literal)
-{
-       if(literal.token=="true")
-               result = 1.0f;
-       else if(literal.token=="false")
-               result = 0.0f;
-       else
-               result = lexical_cast<float>(literal.token);
-       result_valid = true;
-}
-
-void Compiler::ExpressionEvaluator::visit(ParenthesizedExpression &parexp)
-{
-       parexp.expression->visit(*this);
-}
-
-void Compiler::ExpressionEvaluator::visit(VariableReference &var)
-{
-       if(!var.declaration)
-               return;
-
-       if(variable_values)
-       {
-               ValueMap::const_iterator i = variable_values->find(var.declaration);
-               if(i!=variable_values->end())
-                       i->second->visit(*this);
-       }
-       else if(var.declaration->init_expression)
-               var.declaration->init_expression->visit(*this);
-}
-
-void Compiler::ExpressionEvaluator::visit(UnaryExpression &unary)
-{
-       result_valid = false;
-       unary.expression->visit(*this);
-       if(!result_valid)
-               return;
-
-       if(unary.oper=="!")
-               result = !result;
-       else
-               result_valid = false;
-}
-
-void Compiler::ExpressionEvaluator::visit(BinaryExpression &binary)
-{
-       result_valid = false;
-       binary.left->visit(*this);
-       if(!result_valid)
-               return;
-
-       float left_result = result;
-       result_valid = false;
-       binary.right->visit(*this);
-       if(!result_valid)
-               return;
-
-       if(binary.oper=="<")
-               result = (left_result<result);
-       else if(binary.oper=="<=")
-               result = (left_result<=result);
-       else if(binary.oper==">")
-               result = (left_result>result);
-       else if(binary.oper==">=")
-               result = (left_result>=result);
-       else if(binary.oper=="==")
-               result = (left_result==result);
-       else if(binary.oper=="!=")
-               result = (left_result!=result);
-       else if(binary.oper=="&&")
-               result = (left_result && result);
-       else if(binary.oper=="||")
-               result = (left_result || result);
-       else
-               result_valid = false;
-}
-
-
-Compiler::ConstantConditionEliminator::ConstantConditionEliminator():
-       scope_level(0),
-       record_only(false)
-{ }
-
-void Compiler::ConstantConditionEliminator::visit(Block &block)
-{
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       BlockModifier::visit(block);
-
-       for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
-               variable_values.erase(i->second);
-}
-
-void Compiler::ConstantConditionEliminator::visit(UnaryExpression &unary)
-{
-       if(VariableReference *var = dynamic_cast<VariableReference *>(unary.expression.get()))
-               if(unary.oper=="++" || unary.oper=="--")
-                       variable_values.erase(var->declaration);
-}
-
-void Compiler::ConstantConditionEliminator::visit(Assignment &assign)
-{
-       variable_values.erase(assign.target_declaration);
-}
-
-void Compiler::ConstantConditionEliminator::visit(VariableDeclaration &var)
-{
-       if(var.constant || scope_level>1)
-               variable_values[&var] = var.init_expression.get();
-}
-
-void Compiler::ConstantConditionEliminator::visit(Conditional &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 Compiler::ConstantConditionEliminator::visit(Iteration &iter)
-{
-       if(!record_only)
-       {
-               if(iter.condition)
-               {
-                       /* 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);
-}
-
-
-Compiler::UnusedVariableLocator::UnusedVariableLocator():
-       aggregate(0),
-       assignment(0),
-       assignment_target(false),
-       assign_to_subscript(false),
-       global_scope(true)
-{ }
-
-void Compiler::UnusedVariableLocator::apply(Stage &s)
-{
-       variables.push_back(BlockVariableMap());
-       Visitor::apply(s);
-       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 Compiler::UnusedVariableLocator::visit(VariableReference &var)
-{
-       map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
-       if(i!=aggregates.end())
-               unused_nodes.erase(i->second);
-
-       if(var.declaration && !assignment_target)
-       {
-               VariableInfo &var_info = variables.back()[var.declaration];
-               var_info.assignments.clear();
-               var_info.referenced = true;
-       }
-}
-
-void Compiler::UnusedVariableLocator::visit(MemberAccess &memacc)
-{
-       TraversingVisitor::visit(memacc);
-       unused_nodes.erase(memacc.declaration);
-}
-
-void Compiler::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);
-       }
-       else
-               TraversingVisitor::visit(binary);
-}
-
-void Compiler::UnusedVariableLocator::visit(Assignment &assign)
-{
-       {
-               assign_to_subscript = false;
-               SetForScope<bool> set(assignment_target, !assign.self_referencing);
-               assign.left->visit(*this);
-       }
-       assign.right->visit(*this);
-       assignment = &assign;
-}
-
-void Compiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool chained)
-{
-       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 Compiler::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 Compiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
-{
-       assignment = 0;
-       TraversingVisitor::visit(expr);
-       if(assignment && assignment->target_declaration)
-               record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript));
-}
-
-void Compiler::UnusedVariableLocator::visit(StructDeclaration &strct)
-{
-       SetForScope<Node *> set(aggregate, &strct);
-       unused_nodes.insert(&strct);
-       TraversingVisitor::visit(strct);
-}
-
-void Compiler::UnusedVariableLocator::visit(VariableDeclaration &var)
-{
-       if(aggregate)
-               aggregates[&var] = aggregate;
-       else
-       {
-               variables.back()[&var].local = true;
-               if(var.init_expression)
-                       record_assignment(var, *var.init_expression, false);
-       }
-       unused_nodes.erase(var.type_declaration);
-       TraversingVisitor::visit(var);
-}
-
-void Compiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
-{
-       SetForScope<Node *> set(aggregate, &iface);
-       unused_nodes.insert(&iface);
-       TraversingVisitor::visit(iface);
-}
-
-void Compiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
-{
-       variables.push_back(BlockVariableMap());
-
-       {
-               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);
-       }
-
-       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 Compiler::UnusedVariableLocator::merge_down_variables()
-{
-       BlockVariableMap &parent_variables = variables[variables.size()-2];
-       BlockVariableMap &block_variables = variables.back();
-       for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
-       {
-               if(i->second.local)
-               {
-                       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
-               {
-                       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());
-               }
-       }
-       variables.pop_back();
-}
-
-void Compiler::UnusedVariableLocator::visit(Conditional &cond)
-{
-       cond.condition->visit(*this);
-       variables.push_back(BlockVariableMap());
-       cond.body.visit(*this);
-
-       BlockVariableMap if_variables;
-       swap(variables.back(), if_variables);
-       cond.else_body.visit(*this);
-
-       BlockVariableMap &else_variables = variables.back();
-       for(BlockVariableMap::iterator i=else_variables.begin(); i!=else_variables.end(); ++i)
-       {
-               BlockVariableMap::iterator j = if_variables.find(i->first);
-               if(j!=if_variables.end())
-               {
-                       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.conditionally_assigned = true;
-       }
-
-       for(BlockVariableMap::iterator i=if_variables.begin(); i!=if_variables.end(); ++i)
-       {
-               i->second.conditionally_assigned = true;
-               else_variables.insert(*i);
-       }
-
-       merge_down_variables();
-}
-
-void Compiler::UnusedVariableLocator::visit(Iteration &iter)
-{
-       variables.push_back(BlockVariableMap());
-       TraversingVisitor::visit(iter);
-
-       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();
-}
-
-
-Compiler::UnusedVariableLocator::VariableInfo::VariableInfo():
-       local(false),
-       conditionally_assigned(false),
-       referenced(false)
-{ }
-
-
-void Compiler::UnusedFunctionLocator::visit(FunctionCall &call)
-{
-       TraversingVisitor::visit(call);
-
-       unused_nodes.erase(call.declaration);
-       if(call.declaration && call.declaration->definition!=call.declaration)
-               used_definitions.insert(call.declaration->definition);
-}
-
-void Compiler::UnusedFunctionLocator::visit(FunctionDeclaration &func)
-{
-       TraversingVisitor::visit(func);
-
-       if((func.name!="main" || func.body.body.empty()) && !used_definitions.count(&func))
-               unused_nodes.insert(&func);
-}
-
-
-Compiler::NodeRemover::NodeRemover(const set<Node *> &r):
-       to_remove(r)
-{ }
-
-void Compiler::NodeRemover::visit(Block &block)
-{
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-       {
-               (*i)->visit(*this);
-               if(to_remove.count(i->get()))
-                       block.body.erase(i++);
-               else
-                       ++i;
-       }
-}
-
-void Compiler::NodeRemover::visit(VariableDeclaration &var)
-{
-       if(to_remove.count(&var))
-       {
-               stage->in_variables.erase(var.name);
-               stage->out_variables.erase(var.name);
-               stage->locations.erase(var.name);
-               if(var.linked_declaration)
-                       var.linked_declaration->linked_declaration = 0;
-       }
-       else if(var.init_expression && to_remove.count(var.init_expression.get()))
-               var.init_expression = 0;
-}
-
-void Compiler::NodeRemover::visit(Iteration &iter)
-{
-       if(to_remove.count(iter.init_statement.get()))
-               iter.init_statement = 0;
-       TraversingVisitor::visit(iter);
-}
-
-
-void Compiler::PrecisionRemover::visit(Precision &)
-{
-       remove_node = true;
-}
-
-void Compiler::PrecisionRemover::visit(VariableDeclaration &var)
-{
-       var.precision.clear();
-}
-
-
-Compiler::DefaultPrecisionGenerator::DefaultPrecisionGenerator():
-       toplevel(true)
-{ }
-
-void Compiler::DefaultPrecisionGenerator::visit(Block &block)
-{
-       if(toplevel)
-       {
-               SetForScope<bool> set(toplevel, false);
-               BlockModifier::visit(block);
-       }
-       else
-               Visitor::visit(block);
-}
-
-void Compiler::DefaultPrecisionGenerator::visit(Precision &prec)
-{
-       have_default.insert(prec.type);
-}
-
-void Compiler::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);
-       }
-}
-
-
-Compiler::LegacyConverter::LegacyConverter():
-       target_api(get_gl_api()),
-       target_version(get_glsl_version()),
-       frag_out(0)
-{ }
-
-Compiler::LegacyConverter::LegacyConverter(const Version &v):
-       target_api(get_gl_api()),
-       target_version(v),
-       frag_out(0)
-{ }
-
-bool Compiler::LegacyConverter::check_version(const Version &feature_version) const
-{
-       if(target_version<feature_version)
-               return false;
-       else if(stage->required_version<feature_version)
-               stage->required_version = feature_version;
-
-       return true;
-}
-
-bool Compiler::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 Compiler::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 Compiler::LegacyConverter::visit(VariableReference &var)
-{
-       if(var.declaration==frag_out && !supports_unified_interface_syntax())
-       {
-               var.name = "gl_FragColor";
-               var.declaration = 0;
-               type = "vec4";
-       }
-       else if(var.declaration)
-               type = var.declaration->type;
-       else
-               type = string();
-}
-
-void Compiler::LegacyConverter::visit(Assignment &assign)
-{
-       TraversingVisitor::visit(assign);
-       if(assign.target_declaration==frag_out && !supports_unified_interface_syntax())
-               assign.target_declaration = 0;
-}
-
-bool Compiler::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 Compiler::LegacyConverter::visit(FunctionCall &call)
-{
-       if(call.name=="texture" && !call.declaration && !supports_unified_sampling_functions())
-       {
-               NodeArray<Expression>::iterator i = call.arguments.begin();
-               if(i!=call.arguments.end())
-               {
-                       (*i)->visit(*this);
-                       if(type=="sampler1D")
-                               call.name = "texture1D";
-                       else if(type=="sampler2D")
-                               call.name = "texture2D";
-                       else if(type=="sampler3D")
-                               call.name = "texture3D";
-                       else if(type=="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);
-               }
-       }
-       else
-               TraversingVisitor::visit(call);
-}
-
-bool Compiler::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 Compiler::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 Compiler::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 Compiler::LegacyConverter::visit(VariableDeclaration &var)
-{
-       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) ;
-               if(i!=var.layout->qualifiers.end())
-               {
-                       unsigned location = lexical_cast<unsigned>(i->value);
-                       if(stage->type==VERTEX && var.interface=="in")
-                       {
-                               stage->locations[var.name] = location;
-                               var.layout->qualifiers.erase(i);
-                       }
-                       else if(stage->type==FRAGMENT && var.interface=="out")
-                       {
-                               if(location!=0)
-                                       static Require _req(EXT_gpu_shader4);
-                               stage->locations[var.name] = location;
-                               var.layout->qualifiers.erase(i);
-                       }
-
-                       if(var.layout->qualifiers.empty())
-                               var.layout = 0;
-               }
-       }
-
-       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")
-               {
-                       frag_out = &var;
-                       remove_node = true;
-               }
-       }
-
-       TraversingVisitor::visit(var);
-}
-
-bool Compiler::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 Compiler::LegacyConverter::visit(InterfaceBlock &iface)
+void Compiler::inject_block(Block &target, const Block &source)
 {
-       if(!supports_interface_blocks(iface.interface))
-               flatten_block(iface.members);
+       auto insert_point = target.body.begin();
+       for(const RefPtr<Statement> &s: source.body)
+               target.body.insert(insert_point, s->clone());
 }
 
 } // namespace SL