]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/generate.cpp
Avoid generating passthroughs for builtin variables
[libs/gl.git] / source / glsl / generate.cpp
index f3c57a2f0f9190352860bc5f7bc22ff634433123..c670bc1a814ee1002eac71285c9002fe568c1968 100644 (file)
@@ -1,4 +1,8 @@
+#include <algorithm>
+#include <msp/core/hash.h>
 #include <msp/core/raii.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
 #include "builtin.h"
 #include "generate.h"
 
@@ -8,231 +12,1000 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-DeclarationCombiner::DeclarationCombiner():
-       toplevel(true)
+ConstantSpecializer::ConstantSpecializer():
+       values(0)
 { }
 
-void DeclarationCombiner::visit(Block &block)
+void ConstantSpecializer::apply(Stage &stage, const map<string, int> *v)
 {
-       if(!toplevel)
-               return;
-
-       SetForScope<bool> set(toplevel, false);
-       BlockModifier::visit(block);
+       values = v;
+       stage.content.visit(*this);
 }
 
-void DeclarationCombiner::visit(FunctionDeclaration &func)
+void ConstantSpecializer::visit(VariableDeclaration &var)
 {
-       vector<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
+       bool specializable = false;
+       if(var.layout)
        {
-               for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+               vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
+               for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+                       if(i->name=="constant_id")
+                       {
+                               specializable = true;
+                               if(values)
+                                       qualifiers.erase(i);
+                               else if(i->value==-1)
+                                       i->value = hash32(var.name)&0x7FFFFFFF;
+                               break;
+                       }
+
+               if(qualifiers.empty())
+                       var.layout = 0;
+       }
+
+       if(specializable && values)
+       {
+               map<string, int>::const_iterator i = values->find(var.name);
+               if(i!=values->end())
                {
-                       (*i)->definition = func.definition;
-                       (*i)->body.body.clear();
+                       RefPtr<Literal> literal = new Literal;
+                       if(var.type=="bool")
+                       {
+                               literal->token = (i->second ? "true" : "false");
+                               literal->value = static_cast<bool>(i->second);
+                       }
+                       else if(var.type=="int")
+                       {
+                               literal->token = lexical_cast<string>(i->second);
+                               literal->value = i->second;
+                       }
+                       var.init_expression = literal;
                }
        }
-       decls.push_back(&func);
 }
 
-void DeclarationCombiner::visit(VariableDeclaration &var)
+
+void BlockHierarchyResolver::enter(Block &block)
+{
+       r_any_resolved |= (current_block!=block.parent);
+       block.parent = current_block;
+}
+
+
+TypeResolver::TypeResolver():
+       stage(0),
+       iface_block(0),
+       r_any_resolved(false)
+{ }
+
+bool TypeResolver::apply(Stage &s)
+{
+       stage = &s;
+       s.types.clear();
+       r_any_resolved = false;
+       s.content.visit(*this);
+       return r_any_resolved;
+}
+
+TypeDeclaration *TypeResolver::get_or_create_array_type(TypeDeclaration &type)
+{
+       map<TypeDeclaration *, TypeDeclaration *>::iterator i = array_types.find(&type);
+       if(i!=array_types.end())
+               return i->second;
+
+       BasicTypeDeclaration *array = new BasicTypeDeclaration;
+       array->source = BUILTIN_SOURCE;
+       array->name = type.name+"[]";
+       array->kind = BasicTypeDeclaration::ARRAY;
+       array->base = type.name;
+       array->base_type = &type;
+       stage->content.body.insert(type_insert_point, array);
+       array_types[&type] = array;
+       return array;
+}
+
+void TypeResolver::resolve_type(TypeDeclaration *&type, const string &name, bool array)
 {
-       VariableDeclaration *&ptr = variables[var.name];
-       if(ptr)
+       TypeDeclaration *resolved = 0;
+       map<string, TypeDeclaration *>::iterator i = stage->types.find(name);
+       if(i!=stage->types.end())
        {
-               ptr->type = var.type;
-               if(var.init_expression)
-                       ptr->init_expression = var.init_expression;
-               if(var.layout)
-               {
-                       if(ptr->layout)
+               map<TypeDeclaration *, TypeDeclaration *>::iterator j = alias_map.find(i->second);
+               resolved = (j!=alias_map.end() ? j->second : i->second);
+       }
+
+       if(resolved && array)
+               resolved = get_or_create_array_type(*resolved);
+
+       r_any_resolved |= (resolved!=type);
+       type=resolved;
+}
+
+void TypeResolver::visit(Block &block)
+{
+       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+       {
+               if(!block.parent)
+                       type_insert_point = i;
+               (*i)->visit(*this);
+       }
+}
+
+void TypeResolver::visit(BasicTypeDeclaration &type)
+{
+       resolve_type(type.base_type, type.base, false);
+
+       if(type.kind==BasicTypeDeclaration::VECTOR && type.base_type)
+               if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+                       if(basic_base->kind==BasicTypeDeclaration::VECTOR)
                        {
-                               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);
-                               }
+                               type.kind = BasicTypeDeclaration::MATRIX;
+                               /* A matrix's base type is its column vector type.  This will put
+                               the column vector's size, i.e. the matrix's row count, in the high
+                               half of the size. */
+                               type.size |= basic_base->size<<16;
                        }
-                       else
-                               ptr->layout = var.layout;
-               }
-               remove_node = true;
+
+       if(type.kind==BasicTypeDeclaration::ALIAS && type.base_type)
+               alias_map[&type] = type.base_type;
+       else if(type.kind==BasicTypeDeclaration::ARRAY && type.base_type)
+               array_types[type.base_type] = &type;
+
+       stage->types.insert(make_pair(type.name, &type));
+}
+
+void TypeResolver::visit(ImageTypeDeclaration &type)
+{
+       resolve_type(type.base_type, type.base, false);
+       stage->types.insert(make_pair(type.name, &type));
+}
+
+void TypeResolver::visit(StructDeclaration &strct)
+{
+       stage->types.insert(make_pair(strct.name, &strct));
+       TraversingVisitor::visit(strct);
+}
+
+void TypeResolver::visit(VariableDeclaration &var)
+{
+       resolve_type(var.type_declaration, var.type, var.array);
+       if(iface_block && var.interface==iface_block->interface)
+               var.interface.clear();
+}
+
+void TypeResolver::visit(InterfaceBlock &iface)
+{
+       if(iface.members)
+       {
+               SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
+               iface.members->visit(*this);
+
+               StructDeclaration *strct = new StructDeclaration;
+               strct->source = INTERNAL_SOURCE;
+               strct->name = format("_%s_%s", iface.interface, iface.name);
+               strct->members.body.splice(strct->members.body.begin(), iface.members->body);
+               stage->content.body.insert(type_insert_point, strct);
+               stage->types.insert(make_pair(strct->name, strct));
+
+               iface.members = 0;
+               strct->interface_block = &iface;
+               iface.struct_declaration = strct;
        }
-       else
-               ptr = &var;
+
+       TypeDeclaration *type = iface.struct_declaration;
+       if(type && iface.array)
+               type = get_or_create_array_type(*type);
+       r_any_resolved = (type!=iface.type_declaration);
+       iface.type_declaration = type;
+}
+
+void TypeResolver::visit(FunctionDeclaration &func)
+{
+       resolve_type(func.return_type_declaration, func.return_type, false);
+       TraversingVisitor::visit(func);
 }
 
 
 VariableResolver::VariableResolver():
-       anonymous(false),
+       stage(0),
+       r_any_resolved(false),
        record_target(false),
-       assignment_target(0),
-       self_referencing(false)
+       r_self_referencing(false)
 { }
 
-void VariableResolver::apply(Stage &stage)
+bool VariableResolver::apply(Stage &s)
 {
-       Stage *builtins = get_builtins(stage.type);
-       if(builtins)
-               blocks.push_back(&builtins->content);
-       visit(stage.content);
-       if(builtins)
-               blocks.pop_back();
+       stage = &s;
+       s.interface_blocks.clear();
+       r_any_resolved = false;
+       s.content.visit(*this);
+       for(vector<VariableDeclaration *>::const_iterator i=redeclared_builtins.begin(); i!=redeclared_builtins.end(); ++i)
+               (*i)->source = GENERATED_SOURCE;
+       NodeRemover().apply(s, nodes_to_remove);
+       return r_any_resolved;
 }
 
-void VariableResolver::visit(Block &block)
+void VariableResolver::enter(Block &block)
 {
-       blocks.push_back(&block);
        block.variables.clear();
-       TraversingVisitor::visit(block);
-       blocks.pop_back();
 }
 
-void VariableResolver::visit(VariableReference &var)
+void VariableResolver::visit(RefPtr<Expression> &expr)
 {
-       var.declaration = 0;
-       type = 0;
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+       r_replacement_expr = 0;
+       expr->visit(*this);
+       if(r_replacement_expr)
        {
-               --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;
-               }
+               expr = r_replacement_expr;
+               /* Don't record assignment target when doing a replacement, because chain
+               information won't be correct. */
+               r_assignment_target.declaration = 0;
+               r_any_resolved = true;
        }
+       r_replacement_expr = 0;
+}
 
+void VariableResolver::check_assignment_target(Statement *declaration)
+{
        if(record_target)
        {
-               if(assignment_target)
+               if(r_assignment_target.declaration)
                {
+                       /* More than one reference found in assignment target.  Unable to
+                       determine what the primary target is. */
                        record_target = false;
-                       assignment_target = 0;
+                       r_assignment_target.declaration = 0;
+               }
+               else
+                       r_assignment_target.declaration = declaration;
+       }
+       // TODO This check is overly broad and may prevent some optimizations.
+       else if(declaration && declaration==r_assignment_target.declaration)
+               r_self_referencing = true;
+}
+
+void VariableResolver::visit(VariableReference &var)
+{
+       VariableDeclaration *declaration = 0;
+
+       /* Look for variable declarations in the block hierarchy first.  Interface
+       blocks are always defined in the top level so we can't accidentally skip
+       one. */
+       for(Block *block=current_block; (!declaration && block); block=block->parent)
+       {
+               map<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
+               if(i!=block->variables.end())
+                       declaration = i->second;
+       }
+
+       if(!declaration)
+       {
+               const map<string, InterfaceBlock *> &blocks = stage->interface_blocks;
+               map<string, InterfaceBlock *>::const_iterator i = blocks.find("_"+var.name);
+               if(i!=blocks.end())
+               {
+                       /* The name refers to an interface block with an instance name rather
+                       than a variable.  Prepare a new syntax tree node accordingly. */
+                       InterfaceBlockReference *iface_ref = new InterfaceBlockReference;
+                       iface_ref->source = var.source;
+                       iface_ref->line = var.line;
+                       iface_ref->name = var.name;
+                       iface_ref->declaration = i->second;
+                       r_replacement_expr = iface_ref;
                }
                else
-                       assignment_target = var.declaration;
+               {
+                       // Look for the variable in anonymous interface blocks.
+                       for(i=blocks.begin(); (!declaration && i!=blocks.end()); ++i)
+                               if(i->second->instance_name.empty() && i->second->struct_declaration)
+                               {
+                                       const map<string, VariableDeclaration *> &iface_vars = i->second->struct_declaration->members.variables;
+                                       map<string, VariableDeclaration *>::const_iterator j = iface_vars.find(var.name);
+                                       if(j!=iface_vars.end())
+                                               declaration = j->second;
+                               }
+               }
        }
-       else if(var.declaration && var.declaration==assignment_target)
-               self_referencing = true;
+
+       r_any_resolved |= (declaration!=var.declaration);
+       var.declaration = declaration;
+
+       check_assignment_target(var.declaration);
+}
+
+void VariableResolver::visit(InterfaceBlockReference &iface)
+{
+       map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find("_"+iface.name);
+       InterfaceBlock *declaration = (i!=stage->interface_blocks.end() ? i->second : 0);
+       r_any_resolved |= (declaration!=iface.declaration);
+       iface.declaration = declaration;
+
+       check_assignment_target(iface.declaration);
+}
+
+void VariableResolver::add_to_chain(Assignment::Target::ChainType type, unsigned index)
+{
+       if(r_assignment_target.chain_len<7)
+               r_assignment_target.chain[r_assignment_target.chain_len] = type | min<unsigned>(index, 0x3F);
+       ++r_assignment_target.chain_len;
 }
 
 void VariableResolver::visit(MemberAccess &memacc)
 {
-       type = 0;
        TraversingVisitor::visit(memacc);
-       memacc.declaration = 0;
-       if(type)
+
+       VariableDeclaration *declaration = 0;
+       if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
        {
-               map<string, VariableDeclaration *>::iterator i = type->members.variables.find(memacc.member);
-               if(i!=type->members.variables.end())
+               map<string, VariableDeclaration *>::iterator i = strct->members.variables.find(memacc.member);
+               if(i!=strct->members.variables.end())
                {
-                       memacc.declaration = i->second;
-                       type = i->second->type_declaration;
+                       declaration = i->second;
+
+                       if(record_target)
+                       {
+                               unsigned index = 0;
+                               for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); (j!=strct->members.body.end() && j->get()!=i->second); ++j)
+                                       ++index;
+
+                               add_to_chain(Assignment::Target::MEMBER, index);
+                       }
                }
-               else
-                       type = 0;
+       }
+       else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(memacc.left->type))
+       {
+               bool scalar_swizzle = ((basic->kind==BasicTypeDeclaration::INT || basic->kind==BasicTypeDeclaration::FLOAT) && memacc.member.size()==1);
+               bool vector_swizzle = (basic->kind==BasicTypeDeclaration::VECTOR && memacc.member.size()<=4);
+               if(scalar_swizzle || vector_swizzle)
+               {
+                       static const char component_names[] = { 'x', 'r', 's', 'y', 'g', 't', 'z', 'b', 'p', 'w', 'a', 'q' };
+
+                       bool ok = true;
+                       UInt8 components[4] = { };
+                       for(unsigned i=0; (ok && i<memacc.member.size()); ++i)
+                               ok = ((components[i] = (find(component_names, component_names+12, memacc.member[i])-component_names)/3) < 4);
+
+                       if(ok)
+                       {
+                               Swizzle *swizzle = new Swizzle;
+                               swizzle->source = memacc.source;
+                               swizzle->line = memacc.line;
+                               swizzle->oper = memacc.oper;
+                               swizzle->left = memacc.left;
+                               swizzle->component_group = memacc.member;
+                               swizzle->count = memacc.member.size();
+                               copy(components, components+memacc.member.size(), swizzle->components);
+                               r_replacement_expr = swizzle;
+                       }
+               }
+       }
+
+       r_any_resolved |= (declaration!=memacc.declaration);
+       memacc.declaration = declaration;
+}
+
+void VariableResolver::visit(Swizzle &swizzle)
+{
+       TraversingVisitor::visit(swizzle);
+
+       if(record_target)
+       {
+               unsigned mask = 0;
+               for(unsigned i=0; i<swizzle.count; ++i)
+                       mask |= 1<<swizzle.components[i];
+               add_to_chain(Assignment::Target::SWIZZLE, mask);
        }
 }
 
 void VariableResolver::visit(BinaryExpression &binary)
 {
-       if(binary.oper=="[")
+       if(binary.oper->token[0]=='[')
        {
                {
-                       SetForScope<bool> set(record_target, false);
-                       binary.right->visit(*this);
+                       /* The subscript expression is not a part of the primary assignment
+                       target. */
+                       SetFlag set(record_target, false);
+                       visit(binary.right);
+               }
+               visit(binary.left);
+
+               if(record_target)
+               {
+                       unsigned index = 0x3F;
+                       if(Literal *literal_subscript = dynamic_cast<Literal *>(binary.right.get()))
+                               if(literal_subscript->value.check_type<int>())
+                                       index = literal_subscript->value.value<int>();
+                       add_to_chain(Assignment::Target::ARRAY, index);
                }
-               type = 0;
-               binary.left->visit(*this);
        }
        else
-       {
                TraversingVisitor::visit(binary);
-               type = 0;
-       }
 }
 
 void VariableResolver::visit(Assignment &assign)
 {
        {
                SetFlag set(record_target);
-               assignment_target = 0;
-               assign.left->visit(*this);
+               r_assignment_target = Assignment::Target();
+               visit(assign.left);
+               r_any_resolved |= (r_assignment_target<assign.target || assign.target<r_assignment_target);
+               assign.target = r_assignment_target;
        }
 
-       self_referencing = false;
-       assign.right->visit(*this);
-
-       assign.self_referencing = (self_referencing || assign.oper!="=");
-       assign.target_declaration = assignment_target;
+       r_self_referencing = false;
+       visit(assign.right);
+       assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
 }
 
-void VariableResolver::visit(StructDeclaration &strct)
+void VariableResolver::merge_layouts(Layout &to_layout, const Layout &from_layout)
 {
-       TraversingVisitor::visit(strct);
-       blocks.back()->types[strct.name] = &strct;
+       for(vector<Layout::Qualifier>::const_iterator i=from_layout.qualifiers.begin(); i!=from_layout.qualifiers.end(); ++i)
+       {
+               bool found = false;
+               for(vector<Layout::Qualifier>::iterator j=to_layout.qualifiers.begin(); (!found && j!=to_layout.qualifiers.end()); ++j)
+                       if(j->name==i->name)
+                       {
+                               j->has_value = i->value;
+                               j->value = i->value;
+                               found = true;
+                       }
+
+               if(!found)
+                       to_layout.qualifiers.push_back(*i);
+       }
 }
 
 void VariableResolver::visit(VariableDeclaration &var)
 {
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+       TraversingVisitor::visit(var);
+       VariableDeclaration *&ptr = current_block->variables[var.name];
+       if(!ptr)
+               ptr = &var;
+       else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type)
        {
-               --i;
-               map<string, StructDeclaration *>::iterator j = (*i)->types.find(var.type);
-               if(j!=(*i)->types.end())
-                       var.type_declaration = j->second;
-       }
+               if(ptr->source==BUILTIN_SOURCE)
+                       redeclared_builtins.push_back(&var);
+               else
+                       stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+                               format("Redeclaring non-builtin variable '%s' is deprecated", var.name)));
 
-       if(!block_interface.empty() && var.interface.empty())
-               var.interface = block_interface;
+               if(var.init_expression)
+                       ptr->init_expression = var.init_expression;
+               if(var.layout)
+               {
+                       if(ptr->layout)
+                               merge_layouts(*ptr->layout, *var.layout);
+                       else
+                               ptr->layout = var.layout;
+               }
+               nodes_to_remove.insert(&var);
 
-       TraversingVisitor::visit(var);
-       blocks.back()->variables[var.name] = &var;
-       if(anonymous && blocks.size()>1)
-               blocks[blocks.size()-2]->variables[var.name] = &var;
+               r_any_resolved = true;
+       }
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)
 {
-       SetFlag set(anonymous);
-       SetForScope<string> set2(block_interface, iface.interface);
+       /* Block names can be reused in different interfaces.  Prefix the name with
+       the first character of the interface to avoid conflicts. */
+       stage->interface_blocks.insert(make_pair(iface.interface+iface.name, &iface));
+       if(!iface.instance_name.empty())
+               stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface));
+
        TraversingVisitor::visit(iface);
 }
 
 
+ExpressionResolver::ExpressionResolver():
+       stage(0),
+       r_any_resolved(false)
+{ }
+
+bool ExpressionResolver::apply(Stage &s)
+{
+       stage = &s;
+       r_any_resolved = false;
+       s.content.visit(*this);
+       return r_any_resolved;
+}
+
+bool ExpressionResolver::is_scalar(BasicTypeDeclaration &type)
+{
+       return (type.kind==BasicTypeDeclaration::INT || type.kind==BasicTypeDeclaration::FLOAT);
+}
+
+bool ExpressionResolver::is_vector_or_matrix(BasicTypeDeclaration &type)
+{
+       return (type.kind==BasicTypeDeclaration::VECTOR || type.kind==BasicTypeDeclaration::MATRIX);
+}
+
+BasicTypeDeclaration *ExpressionResolver::get_element_type(BasicTypeDeclaration &type)
+{
+       if(is_vector_or_matrix(type) || type.kind==BasicTypeDeclaration::ARRAY)
+       {
+               BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type);
+               return (basic_base ? get_element_type(*basic_base) : 0);
+       }
+       else
+               return &type;
+}
+
+bool ExpressionResolver::can_convert(BasicTypeDeclaration &from, BasicTypeDeclaration &to)
+{
+       if(from.kind==BasicTypeDeclaration::INT && to.kind==BasicTypeDeclaration::FLOAT)
+               return from.size<=to.size;
+       else if(from.kind!=to.kind)
+               return false;
+       else if((from.kind==BasicTypeDeclaration::VECTOR || from.kind==BasicTypeDeclaration::MATRIX) && from.size==to.size)
+       {
+               BasicTypeDeclaration *from_base = dynamic_cast<BasicTypeDeclaration *>(from.base_type);
+               BasicTypeDeclaration *to_base = dynamic_cast<BasicTypeDeclaration *>(to.base_type);
+               return (from_base && to_base && can_convert(*from_base, *to_base));
+       }
+       else
+               return false;
+}
+
+ExpressionResolver::Compatibility ExpressionResolver::get_compatibility(BasicTypeDeclaration &left, BasicTypeDeclaration &right)
+{
+       if(&left==&right)
+               return SAME_TYPE;
+       else if(can_convert(left, right))
+               return LEFT_CONVERTIBLE;
+       else if(can_convert(right, left))
+               return RIGHT_CONVERTIBLE;
+       else
+               return NOT_COMPATIBLE;
+}
+
+BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration::Kind kind, unsigned size)
+{
+       for(vector<BasicTypeDeclaration *>::const_iterator i=basic_types.begin(); i!=basic_types.end(); ++i)
+               if((*i)->kind==kind && (*i)->size==size)
+                       return *i;
+       return 0;
+}
+
+BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration &elem_type, BasicTypeDeclaration::Kind kind, unsigned size)
+{
+       for(vector<BasicTypeDeclaration *>::const_iterator i=basic_types.begin(); i!=basic_types.end(); ++i)
+               if(get_element_type(**i)==&elem_type && (*i)->kind==kind && (*i)->size==size)
+                       return *i;
+       return 0;
+}
+
+void ExpressionResolver::convert_to(RefPtr<Expression> &expr, BasicTypeDeclaration &type)
+{
+       RefPtr<FunctionCall> call = new FunctionCall;
+       call->name = type.name;
+       call->constructor = true;
+       call->arguments.push_back(0);
+       call->arguments.back() = expr;
+       call->type = &type;
+       expr = call;
+}
+
+bool ExpressionResolver::convert_to_element(RefPtr<Expression> &expr, BasicTypeDeclaration &elem_type)
+{
+       if(BasicTypeDeclaration *expr_basic = dynamic_cast<BasicTypeDeclaration *>(expr->type))
+       {
+               BasicTypeDeclaration *to_type = &elem_type;
+               if(is_vector_or_matrix(*expr_basic))
+                       to_type = find_type(elem_type, expr_basic->kind, expr_basic->size);
+               if(to_type)
+               {
+                       convert_to(expr, *to_type);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+void ExpressionResolver::resolve(Expression &expr, TypeDeclaration *type, bool lvalue)
+{
+       r_any_resolved |= (type!=expr.type || lvalue!=expr.lvalue);
+       expr.type = type;
+       expr.lvalue = lvalue;
+}
+
+void ExpressionResolver::visit(Literal &literal)
+{
+       if(literal.value.check_type<bool>())
+               resolve(literal, find_type(BasicTypeDeclaration::BOOL, 1), false);
+       else if(literal.value.check_type<int>())
+               resolve(literal, find_type(BasicTypeDeclaration::INT, 32), false);
+       else if(literal.value.check_type<float>())
+               resolve(literal, find_type(BasicTypeDeclaration::FLOAT, 32), false);
+}
+
+void ExpressionResolver::visit(ParenthesizedExpression &parexpr)
+{
+       TraversingVisitor::visit(parexpr);
+       resolve(parexpr, parexpr.expression->type, parexpr.expression->lvalue);
+}
+
+void ExpressionResolver::visit(VariableReference &var)
+{
+       if(var.declaration)
+               resolve(var, var.declaration->type_declaration, true);
+}
+
+void ExpressionResolver::visit(InterfaceBlockReference &iface)
+{
+       if(iface.declaration)
+               resolve(iface, iface.declaration->type_declaration, true);
+}
+
+void ExpressionResolver::visit(MemberAccess &memacc)
+{
+       TraversingVisitor::visit(memacc);
+
+       if(memacc.declaration)
+               resolve(memacc, memacc.declaration->type_declaration, memacc.left->lvalue);
+}
+
+void ExpressionResolver::visit(Swizzle &swizzle)
+{
+       TraversingVisitor::visit(swizzle);
+
+       if(BasicTypeDeclaration *left_basic = dynamic_cast<BasicTypeDeclaration *>(swizzle.left->type))
+       {
+               BasicTypeDeclaration *left_elem = get_element_type(*left_basic);
+               if(swizzle.count==1)
+                       resolve(swizzle, left_elem, swizzle.left->lvalue);
+               else if(left_basic->kind==BasicTypeDeclaration::VECTOR && left_elem)
+                       resolve(swizzle, find_type(*left_elem, left_basic->kind, swizzle.count), swizzle.left->lvalue);
+       }
+}
+
+void ExpressionResolver::visit(UnaryExpression &unary)
+{
+       TraversingVisitor::visit(unary);
+
+       BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(unary.expression->type);
+       if(!basic)
+               return;
+
+       char oper = unary.oper->token[0];
+       if(oper=='!')
+       {
+               if(basic->kind!=BasicTypeDeclaration::BOOL)
+                       return;
+       }
+       else if(oper=='~')
+       {
+               if(basic->kind!=BasicTypeDeclaration::INT)
+                       return;
+       }
+       else if(oper=='+' || oper=='-')
+       {
+               BasicTypeDeclaration *elem = get_element_type(*basic);
+               if(!elem || !is_scalar(*elem))
+                       return;
+       }
+       resolve(unary, basic, unary.expression->lvalue);
+}
+
+void ExpressionResolver::visit(BinaryExpression &binary, bool assign)
+{
+       /* Binary operators are only defined for basic types (not for image or
+       structure types). */
+       BasicTypeDeclaration *basic_left = dynamic_cast<BasicTypeDeclaration *>(binary.left->type);
+       BasicTypeDeclaration *basic_right = dynamic_cast<BasicTypeDeclaration *>(binary.right->type);
+       if(!basic_left || !basic_right)
+               return;
+
+       char oper = binary.oper->token[0];
+       if(oper=='[')
+       {
+               /* Subscripting operates on vectors, matrices and arrays, and the right
+               operand must be an integer. */
+               if((!is_vector_or_matrix(*basic_left) && basic_left->kind!=BasicTypeDeclaration::ARRAY) || basic_right->kind!=BasicTypeDeclaration::INT)
+                       return;
+
+               resolve(binary, basic_left->base_type, binary.left->lvalue);
+               return;
+       }
+       else if(basic_left->kind==BasicTypeDeclaration::ARRAY || basic_right->kind==BasicTypeDeclaration::ARRAY)
+               // No other binary operator can be used with arrays.
+               return;
+
+       BasicTypeDeclaration *elem_left = get_element_type(*basic_left);
+       BasicTypeDeclaration *elem_right = get_element_type(*basic_right);
+       if(!elem_left || !elem_right)
+               return;
+
+       Compatibility compat = get_compatibility(*basic_left, *basic_right);
+       Compatibility elem_compat = get_compatibility(*elem_left, *elem_right);
+       if(elem_compat==NOT_COMPATIBLE)
+               return;
+       if(assign && (compat==LEFT_CONVERTIBLE || elem_compat==LEFT_CONVERTIBLE))
+               return;
+
+       TypeDeclaration *type = 0;
+       char oper2 = binary.oper->token[1];
+       if((oper=='<' && oper2!='<') || (oper=='>' && oper2!='>'))
+       {
+               /* Relational operators compare two scalar integer or floating-point
+               values. */
+               if(!is_scalar(*elem_left) || !is_scalar(*elem_right) || compat==NOT_COMPATIBLE)
+                       return;
+
+               type = find_type(BasicTypeDeclaration::BOOL, 1);
+       }
+       else if((oper=='=' || oper=='!') && oper2=='=')
+       {
+               // Equality comparison can be done on any compatible types.
+               if(compat==NOT_COMPATIBLE)
+                       return;
+
+               type = find_type(BasicTypeDeclaration::BOOL, 1);
+       }
+       else if(oper2=='&' || oper2=='|' || oper2=='^')
+       {
+               // Logical operators can only be applied to booleans.
+               if(basic_left->kind!=BasicTypeDeclaration::BOOL || basic_right->kind!=BasicTypeDeclaration::BOOL)
+                       return;
+
+               type = basic_left;
+       }
+       else if((oper=='&' || oper=='|' || oper=='^' || oper=='%') && !oper2)
+       {
+               // Bitwise operators and modulo can only be applied to integers.
+               if(basic_left->kind!=BasicTypeDeclaration::INT || basic_right->kind!=BasicTypeDeclaration::INT)
+                       return;
+
+               type = (compat==LEFT_CONVERTIBLE ? basic_right : basic_left);
+       }
+       else if((oper=='<' || oper=='>') && oper2==oper)
+       {
+               // Shifts apply to integer scalars and vectors, with some restrictions.
+               if(elem_left->kind!=BasicTypeDeclaration::INT || elem_right->kind!=BasicTypeDeclaration::INT)
+                       return;
+               unsigned left_size = (basic_left->kind==BasicTypeDeclaration::INT ? 1 : basic_left->kind==BasicTypeDeclaration::VECTOR ? basic_left->size : 0);
+               unsigned right_size = (basic_right->kind==BasicTypeDeclaration::INT ? 1 : basic_right->kind==BasicTypeDeclaration::VECTOR ? basic_right->size : 0);
+               if(!left_size || (left_size==1 && right_size!=1) || (left_size>1 && right_size!=1 && right_size!=left_size))
+                       return;
+
+               type = basic_left;
+               // Don't perform conversion even if the operands are of different sizes.
+               compat = SAME_TYPE;
+       }
+       else if(oper=='+' || oper=='-' || oper=='*' || oper=='/')
+       {
+               // Arithmetic operators require scalar elements.
+               if(!is_scalar(*elem_left) || !is_scalar(*elem_right))
+                       return;
+
+               if(oper=='*' && is_vector_or_matrix(*basic_left) && is_vector_or_matrix(*basic_right) &&
+                       (basic_left->kind==BasicTypeDeclaration::MATRIX || basic_right->kind==BasicTypeDeclaration::MATRIX))
+               {
+                       /* Multiplication has special rules when at least one operand is a
+                       matrix and the other is a vector or a matrix. */
+                       unsigned left_columns = basic_left->size&0xFFFF;
+                       unsigned right_rows = basic_right->size;
+                       if(basic_right->kind==BasicTypeDeclaration::MATRIX)
+                               right_rows >>= 16;
+                       if(left_columns!=right_rows)
+                               return;
+
+                       BasicTypeDeclaration *elem_result = (elem_compat==LEFT_CONVERTIBLE ? elem_right : elem_left);
+
+                       if(basic_left->kind==BasicTypeDeclaration::VECTOR)
+                               type = find_type(*elem_result, BasicTypeDeclaration::VECTOR, basic_right->size&0xFFFF);
+                       else if(basic_right->kind==BasicTypeDeclaration::VECTOR)
+                               type = find_type(*elem_result, BasicTypeDeclaration::VECTOR, basic_left->size>>16);
+                       else
+                               type = find_type(*elem_result, BasicTypeDeclaration::MATRIX, (basic_left->size&0xFFFF0000)|(basic_right->size&0xFFFF));
+               }
+               else if(compat==NOT_COMPATIBLE)
+               {
+                       // Arithmetic between scalars and matrices or vectors is supported.
+                       if(is_scalar(*basic_left) && is_vector_or_matrix(*basic_right))
+                               type = (elem_compat==RIGHT_CONVERTIBLE ? find_type(*elem_left, basic_right->kind, basic_right->size) : basic_right);
+                       else if(is_vector_or_matrix(*basic_left) && is_scalar(*basic_right))
+                               type = (elem_compat==LEFT_CONVERTIBLE ? find_type(*elem_right, basic_left->kind, basic_left->size) : basic_left);
+                       else
+                               return;
+               }
+               else if(compat==LEFT_CONVERTIBLE)
+                       type = basic_right;
+               else
+                       type = basic_left;
+       }
+       else
+               return;
+
+       if(assign && type!=basic_left)
+               return;
+
+       bool converted = true;
+       if(compat==LEFT_CONVERTIBLE)
+               convert_to(binary.left, *basic_right);
+       else if(compat==RIGHT_CONVERTIBLE)
+               convert_to(binary.right, *basic_left);
+       else if(elem_compat==LEFT_CONVERTIBLE)
+               converted = convert_to_element(binary.left, *elem_right);
+       else if(elem_compat==RIGHT_CONVERTIBLE)
+               converted = convert_to_element(binary.right, *elem_left);
+
+       if(!converted)
+               type = 0;
+
+       resolve(binary, type, assign);
+}
+
+void ExpressionResolver::visit(BinaryExpression &binary)
+{
+       TraversingVisitor::visit(binary);
+       visit(binary, false);
+}
+
+void ExpressionResolver::visit(Assignment &assign)
+{
+       TraversingVisitor::visit(assign);
+
+       if(assign.oper->token[0]!='=')
+               return visit(assign, true);
+       else if(assign.left->type!=assign.right->type)
+       {
+               BasicTypeDeclaration *basic_left = dynamic_cast<BasicTypeDeclaration *>(assign.left->type);
+               BasicTypeDeclaration *basic_right = dynamic_cast<BasicTypeDeclaration *>(assign.right->type);
+               if(!basic_left || !basic_right)
+                       return;
+
+               Compatibility compat = get_compatibility(*basic_left, *basic_right);
+               if(compat==RIGHT_CONVERTIBLE)
+                       convert_to(assign.right, *basic_left);
+               else if(compat!=SAME_TYPE)
+                       return;
+       }
+
+       resolve(assign, assign.left->type, true);
+}
+
+void ExpressionResolver::visit(TernaryExpression &ternary)
+{
+       TraversingVisitor::visit(ternary);
+
+       BasicTypeDeclaration *basic_cond = dynamic_cast<BasicTypeDeclaration *>(ternary.condition->type);
+       if(!basic_cond || basic_cond->kind!=BasicTypeDeclaration::BOOL)
+               return;
+
+       TypeDeclaration *type = 0;
+       if(ternary.true_expr->type==ternary.false_expr->type)
+               type = ternary.true_expr->type;
+       else
+       {
+               BasicTypeDeclaration *basic_true = dynamic_cast<BasicTypeDeclaration *>(ternary.true_expr->type);
+               BasicTypeDeclaration *basic_false = dynamic_cast<BasicTypeDeclaration *>(ternary.false_expr->type);
+               Compatibility compat = get_compatibility(*basic_true, *basic_false);
+               if(compat==NOT_COMPATIBLE)
+                       return;
+
+               type = (compat==LEFT_CONVERTIBLE ? basic_true : basic_false);
+
+               if(compat==LEFT_CONVERTIBLE)
+                       convert_to(ternary.true_expr, *basic_false);
+               else if(compat==RIGHT_CONVERTIBLE)
+                       convert_to(ternary.false_expr, *basic_true);
+       }
+
+       resolve(ternary, type, false);
+}
+
+void ExpressionResolver::visit(FunctionCall &call)
+{
+       TraversingVisitor::visit(call);
+
+       TypeDeclaration *type = 0;
+       if(call.declaration)
+               type = call.declaration->return_type_declaration;
+       else if(call.constructor)
+       {
+               map<string, TypeDeclaration *>::const_iterator i=stage->types.find(call.name);
+               type = (i!=stage->types.end() ? i->second : 0);
+       }
+       resolve(call, type, false);
+}
+
+void ExpressionResolver::visit(BasicTypeDeclaration &type)
+{
+       basic_types.push_back(&type);
+}
+
+void ExpressionResolver::visit(VariableDeclaration &var)
+{
+       TraversingVisitor::visit(var);
+       if(!var.init_expression)
+               return;
+
+       BasicTypeDeclaration *var_basic = dynamic_cast<BasicTypeDeclaration *>(var.type_declaration);
+       BasicTypeDeclaration *init_basic = dynamic_cast<BasicTypeDeclaration *>(var.init_expression->type);
+       if(!var_basic || !init_basic)
+               return;
+
+       Compatibility compat = get_compatibility(*var_basic, *init_basic);
+       if(compat==RIGHT_CONVERTIBLE)
+               convert_to(var.init_expression, *var_basic);
+}
+
+
+bool FunctionResolver::apply(Stage &s)
+{
+       stage = &s;
+       s.functions.clear();
+       r_any_resolved = false;
+       s.content.visit(*this);
+       return r_any_resolved;
+}
+
 void FunctionResolver::visit(FunctionCall &call)
 {
-       map<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
-       if(i!=functions.end())
-               call.declaration = i->second.back();
+       string arg_types;
+       bool has_signature = true;
+       for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
+       {
+               if((*i)->type)
+                       append(arg_types, ",", (*i)->type->name);
+               else
+                       has_signature = false;
+       }
+
+       FunctionDeclaration *declaration = 0;
+       if(has_signature)
+       {
+               map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
+               declaration = (i!=stage->functions.end() ? i->second : 0);
+       }
+       r_any_resolved |= (declaration!=call.declaration);
+       call.declaration = declaration;
 
        TraversingVisitor::visit(call);
 }
 
 void FunctionResolver::visit(FunctionDeclaration &func)
 {
-       vector<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
+       if(func.signature.empty())
+       {
+               string param_types;
+               for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+               {
+                       if((*i)->type_declaration)
+                               append(param_types, ",", (*i)->type_declaration->name);
+                       else
+                               return;
+               }
+               func.signature = format("(%s)", param_types);
+               r_any_resolved = true;
+       }
+
+       string key = func.name+func.signature;
+       FunctionDeclaration *&stage_decl = stage->functions[key];
+       vector<FunctionDeclaration *> &decls = declarations[key];
+       if(func.definition==&func)
        {
+               stage_decl = &func;
+
+               // Set all previous declarations to use this definition.
                for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+               {
+                       r_any_resolved |= (func.definition!=(*i)->definition);
                        (*i)->definition = func.definition;
-               decls.clear();
-               decls.push_back(&func);
+                       (*i)->body.body.clear();
+               }
        }
-       else if(!decls.empty() && decls.back()->definition)
-               func.definition = decls.back()->definition;
        else
-               decls.push_back(&func);
+       {
+               FunctionDeclaration *definition = (stage_decl ? stage_decl->definition : 0);
+               r_any_resolved |= (definition!=func.definition);
+               func.definition = definition;
+
+               if(!stage_decl)
+                       stage_decl = &func;
+       }
+       decls.push_back(&func);
 
        TraversingVisitor::visit(func);
 }
@@ -240,7 +1013,9 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 
 InterfaceGenerator::InterfaceGenerator():
        stage(0),
-       scope_level(0)
+       function_scope(false),
+       copy_block(false),
+       iface_target_block(0)
 { }
 
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
@@ -255,31 +1030,25 @@ string InterfaceGenerator::get_out_prefix(Stage::Type type)
 
 void InterfaceGenerator::apply(Stage &s)
 {
-       SetForScope<Stage *> set(stage, &s);
+       stage = &s;
+       iface_target_block = &stage->content;
        if(stage->previous)
                in_prefix = get_out_prefix(stage->previous->type);
        out_prefix = get_out_prefix(stage->type);
-       visit(s.content);
+       s.content.visit(*this);
+       NodeRemover().apply(s, nodes_to_remove);
 }
 
 void InterfaceGenerator::visit(Block &block)
 {
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+       SetForScope<Block *> set_block(current_block, &block);
+       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
        {
-               (*i)->visit(*this);
+               assignment_insert_point = i;
+               if(&block==&stage->content)
+                       iface_insert_point = i;
 
-               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);
+               (*i)->visit(*this);
        }
 }
 
@@ -289,29 +1058,79 @@ string InterfaceGenerator::change_prefix(const string &name, const string &prefi
        return prefix+name.substr(offset);
 }
 
-bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
+VariableDeclaration *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;
+       if(stage->content.variables.count(name))
+               return 0;
+
+       if(stage->type==Stage::GEOMETRY && !copy_block && var.interface=="out" && var.array)
+               return 0;
 
        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==Stage::GEOMETRY)
+       /* Geometry shader inputs are always arrays.  But if we're bringing in an
+       entire block, the array is on the block and not individual variables. */
+       if(stage->type==Stage::GEOMETRY && !copy_block)
                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->layout = var.layout;
                iface_var->linked_declaration = &var;
-       iface_declarations[name] = iface_var;
+               var.linked_declaration = iface_var;
+       }
+
+       iface_target_block->body.insert(iface_insert_point, iface_var);
+       iface_target_block->variables.insert(make_pair(name, iface_var));
+       if(iface_target_block==&stage->content && iface=="in")
+               declared_inputs.push_back(iface_var);
+
+       return iface_var;
+}
+
+InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
+{
+       if(stage->interface_blocks.count("in"+out_block.name))
+               return 0;
+
+       InterfaceBlock *in_block = new InterfaceBlock;
+       in_block->interface = "in";
+       in_block->name = out_block.name;
+       in_block->members = new Block;
+       in_block->instance_name = out_block.instance_name;
+       if(stage->type==Stage::GEOMETRY)
+               in_block->array = true;
+       else
+               in_block->array = out_block.array;
+       in_block->linked_block = &out_block;
+       out_block.linked_block = in_block;
+
+       {
+               SetFlag set_copy(copy_block, true);
+               SetForScope<Block *> set_target(iface_target_block, in_block->members.get());
+               SetForScope<NodeList<Statement>::iterator> set_ins_pt(iface_insert_point, in_block->members->body.end());
+               if(out_block.struct_declaration)
+                       out_block.struct_declaration->members.visit(*this);
+               else if(out_block.members)
+                       out_block.members->visit(*this);
+       }
+
+       iface_target_block->body.insert(iface_insert_point, in_block);
+       stage->interface_blocks.insert(make_pair("in"+in_block->name, in_block));
+       if(!in_block->instance_name.empty())
+               stage->interface_blocks.insert(make_pair("_"+in_block->instance_name, in_block));
+
+       SetFlag set_scope(function_scope, false);
+       SetForScope<Block *> set_block(current_block, &stage->content);
+       in_block->visit(*this);
 
-       return true;
+       return in_block;
 }
 
 ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
@@ -320,13 +1139,13 @@ ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, E
        VariableReference *ref = new VariableReference;
        ref->name = left;
        assign->left = ref;
-       assign->oper = "=";
+       assign->oper = &Operator::get_operator("=", Operator::BINARY);
        assign->right = right;
 
        ExpressionStatement *stmt = new ExpressionStatement;
        stmt->expression = assign;
+       current_block->body.insert(assignment_insert_point, stmt);
        stmt->visit(*this);
-       insert_nodes.push_back(stmt);
 
        return *stmt;
 }
@@ -335,29 +1154,65 @@ void InterfaceGenerator::visit(VariableReference &var)
 {
        if(var.declaration || !stage->previous)
                return;
-       if(iface_declarations.count(var.name))
+       /* Don't pull a variable from previous stage if we just generated an output
+       interface in this stage */
+       if(stage->content.variables.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())
+       const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+       if(i==prev_vars.end() || i->second->interface!="out")
+               i = prev_vars.find(in_prefix+var.name);
+       if(i!=prev_vars.end() && i->second->interface=="out")
        {
-               generate_interface(*i->second, "in", i->second->name);
-               var.name = i->second->name;
+               if(stage->type==Stage::GEOMETRY && i->second->array)
+                       stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+                               format("Can't access '%s' through automatic interface because it's an array", var.name)));
+               else
+               {
+                       generate_interface(*i->second, "in", i->second->name);
+                       var.name = i->second->name;
+               }
+               return;
        }
+
+       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
+       map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find("_"+var.name);
+       if(j!=prev_blocks.end() && j->second->interface=="out")
+       {
+               generate_interface(*j->second);
+               /* Let VariableResolver convert the variable reference into an interface
+               block reference. */
+               return;
+       }
+
+       for(j=prev_blocks.begin(); j!=prev_blocks.end(); ++j)
+               if(j->second->instance_name.empty() && j->second->struct_declaration)
+               {
+                       const map<string, VariableDeclaration *> &iface_vars = j->second->struct_declaration->members.variables;
+                       i = iface_vars.find(var.name);
+                       if(i!=iface_vars.end())
+                       {
+                               generate_interface(*j->second);
+                               return;
+                       }
+               }
 }
 
 void InterfaceGenerator::visit(VariableDeclaration &var)
 {
-       if(var.interface=="out")
+       if(copy_block)
+               generate_interface(var, "in", var.name);
+       else 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())))
+               /* For output variables in function scope, generate a global interface
+               and replace the local declaration with an assignment. */
+               VariableDeclaration *out_var = 0;
+               if(function_scope && (out_var=generate_interface(var, "out", var.name)))
                {
-                       remove_node = true;
+                       out_var->source = var.source;
+                       out_var->line = var.line;
+                       nodes_to_remove.insert(&var);
                        if(var.init_expression)
                        {
                                ExpressionStatement &stmt = insert_assignment(var.name, var.init_expression->clone());
@@ -367,16 +1222,18 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
                        }
                }
        }
-       else if(var.interface=="in")
+       else if(var.interface=="in" && current_block==&stage->content)
        {
-               stage->in_variables[var.name] = &var;
-               if(var.linked_declaration)
-                       var.linked_declaration->linked_declaration = &var;
-               else if(stage->previous)
+               if(var.name.compare(0, 3, "gl_"))
+                       declared_inputs.push_back(&var);
+
+               /* Try to link input variables in global scope with output variables from
+               previous stage. */
+               if(!var.linked_declaration && 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())
+                       const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+                       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+                       if(i!=prev_vars.end() && i->second->interface=="out")
                        {
                                var.linked_declaration = i->second;
                                i->second->linked_declaration = &var;
@@ -387,40 +1244,65 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        TraversingVisitor::visit(var);
 }
 
-void InterfaceGenerator::visit(Passthrough &pass)
+void InterfaceGenerator::visit(InterfaceBlock &iface)
 {
-       vector<VariableDeclaration *> pass_vars;
+       if(iface.interface=="in")
+       {
+               /* Try to link input blocks with output blocks sharing the same block
+               name from previous stage. */
+               if(!iface.linked_block && stage->previous)
+               {
+                       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
+                       map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.name);
+                       if(i!=prev_blocks.end())
+                       {
+                               iface.linked_block = i->second;
+                               i->second->linked_block = &iface;
+                       }
+               }
+       }
+
+       TraversingVisitor::visit(iface);
+}
 
-       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());
+void InterfaceGenerator::visit(FunctionDeclaration &func)
+{
+       SetFlag set_scope(function_scope, true);
+       // Skip parameters because they're not useful here
+       func.body.visit(*this);
+}
+
+void InterfaceGenerator::visit(Passthrough &pass)
+{
+       // Pass through all input variables declared so far.
+       vector<VariableDeclaration *> pass_vars = declared_inputs;
 
        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)
+               const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+               for(map<string, VariableDeclaration *>::const_iterator i=prev_vars.begin(); i!=prev_vars.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(i->second->interface!="out")
+                               continue;
 
-                       if(!linked && generate_interface(*i->second, "in", i->second->name))
+                       /* Pass through output variables from the previous stage, but only
+                       those which are not already linked to an input here. */
+                       if(!i->second->linked_declaration && generate_interface(*i->second, "in", i->second->name))
                                pass_vars.push_back(i->second);
                }
        }
 
        if(stage->type==Stage::GEOMETRY)
        {
-               VariableReference *ref = new VariableReference;
+               /* Special case for geometry shader: copy gl_Position from input to
+               output. */
+               InterfaceBlockReference *ref = new InterfaceBlockReference;
                ref->name = "gl_in";
 
                BinaryExpression *subscript = new BinaryExpression;
                subscript->left = ref;
-               subscript->oper = "[";
+               subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                subscript->right = pass.subscript;
-               subscript->after = "]";
 
                MemberAccess *memacc = new MemberAccess;
                memacc->left = subscript;
@@ -440,123 +1322,15 @@ void InterfaceGenerator::visit(Passthrough &pass)
                {
                        BinaryExpression *subscript = new BinaryExpression;
                        subscript->left = ref;
-                       subscript->oper = "[";
+                       subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                        subscript->right = pass.subscript;
-                       subscript->after = "]";
                        insert_assignment(out_name, subscript);
                }
                else
                        insert_assignment(out_name, ref);
        }
 
-       remove_node = true;
-}
-
-
-DeclarationReorderer::DeclarationReorderer():
-       scope_level(0),
-       kind(NO_DECLARATION)
-{ }
-
-void DeclarationReorderer::visit(FunctionCall &call)
-{
-       FunctionDeclaration *def = call.declaration;
-       if(def)
-               def = def->definition;
-       if(def && !ordered_funcs.count(def))
-               needed_funcs.insert(def);
-}
-
-void DeclarationReorderer::visit(Block &block)
-{
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       if(scope_level>1)
-               return TraversingVisitor::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 DeclarationReorderer::visit(VariableDeclaration &var)
-{
-       TraversingVisitor::visit(var);
-       kind = VARIABLE;
-}
-
-void DeclarationReorderer::visit(FunctionDeclaration &func)
-{
-       needed_funcs.clear();
-       func.body.visit(*this);
-       needed_funcs.erase(&func);
-       kind = FUNCTION;
+       nodes_to_remove.insert(&pass);
 }
 
 } // namespace SL