X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=99253fe041463ce01a852f340b967cb744f33a50;hp=379a6871ae754aef88ec7b589997493e025733e1;hb=HEAD;hpb=05597fbb3671dfed4776bc5223958c85e780345e

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 379a6871..635d9f15 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -1,6 +1,8 @@
+#include <msp/core/algorithm.h>
+#include <msp/core/hash.h>
 #include <msp/core/raii.h>
-#include "builtin.h"
 #include "generate.h"
+#include "reflect.h"
 
 using namespace std;
 
@@ -8,241 +10,52 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-DeclarationCombiner::DeclarationCombiner():
-	toplevel(true)
-{ }
-
-void DeclarationCombiner::visit(Block &block)
-{
-	if(!toplevel)
-		return;
-
-	SetForScope<bool> set(toplevel, false);
-	BlockModifier::visit(block);
-}
-
-void DeclarationCombiner::visit(FunctionDeclaration &func)
-{
-	vector<FunctionDeclaration *> &decls = functions[func.name];
-	if(func.definition)
-	{
-		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
-		{
-			(*i)->definition = func.definition;
-			(*i)->body.body.clear();
-		}
-	}
-	decls.push_back(&func);
-}
-
-void DeclarationCombiner::visit(VariableDeclaration &var)
-{
-	VariableDeclaration *&ptr = variables[var.name];
-	if(ptr)
-	{
-		ptr->type = var.type;
-		if(var.init_expression)
-			ptr->init_expression = var.init_expression;
-		if(var.layout)
-		{
-			if(ptr->layout)
-			{
-				for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
-				{
-					bool found = false;
-					for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
-						if(j->identifier==i->identifier)
-						{
-							j->value = i->value;
-							found = true;
-						}
-
-					if(!found)
-						ptr->layout->qualifiers.push_back(*i);
-				}
-			}
-			else
-				ptr->layout = var.layout;
-		}
-		remove_node = true;
-	}
-	else
-		ptr = &var;
-}
-
-
-VariableResolver::VariableResolver():
-	anonymous(false),
-	record_target(false),
-	assignment_target(0),
-	self_referencing(false)
-{ }
-
-void VariableResolver::apply(Stage &stage)
-{
-	Stage *builtins = get_builtins(stage.type);
-	if(builtins)
-		blocks.push_back(&builtins->content);
-	visit(stage.content);
-	if(builtins)
-		blocks.pop_back();
-}
-
-void VariableResolver::visit(Block &block)
+void ConstantIdAssigner::apply(Module &module, const Features &features)
 {
-	blocks.push_back(&block);
-	block.variables.clear();
-	TraversingVisitor::visit(block);
-	blocks.pop_back();
-}
+	for(Stage &s: module.stages)
+		s.content.visit(*this);
 
-void VariableResolver::visit(VariableReference &var)
-{
-	var.declaration = 0;
-	type = 0;
-	for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+	for(VariableDeclaration *v: auto_constants)
 	{
-		--i;
-		map<string, VariableDeclaration *>::iterator j = (*i)->variables.find(var.name);
-		if(j!=(*i)->variables.end())
+		unsigned id;
+		auto j = existing_constants.find(v->name);
+		if(j!=existing_constants.end())
+			id = j->second;
+		else
 		{
-			var.declaration = j->second;
-			type = j->second->type_declaration;
-			break;
+			id = hash<32>(v->name)%features.constant_id_range;
+			while(used_ids.count(id))
+				id = (id+1)%features.constant_id_range;
 		}
-	}
 
-	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;
-}
+		auto i = find_member(v->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+		if(i!=v->layout->qualifiers.end())
+			i->value = id;
 
-void VariableResolver::visit(MemberAccess &memacc)
-{
-	type = 0;
-	TraversingVisitor::visit(memacc);
-	memacc.declaration = 0;
-	if(type)
-	{
-		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;
-		}
-		else
-			type = 0;
+		used_ids.insert(id);
+		existing_constants[v->name] = id;
 	}
 }
 
-void VariableResolver::visit(BinaryExpression &binary)
+void ConstantIdAssigner::visit(VariableDeclaration &var)
 {
-	if(binary.oper=="[")
+	if(var.layout)
 	{
+		auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+		if(i!=var.layout->qualifiers.end() && i->has_value)
 		{
-			SetForScope<bool> set(record_target, false);
-			binary.right->visit(*this);
+			if(i->value==-1)
+				auto_constants.push_back(&var);
+			else
+			{
+				existing_constants[var.name] = i->value;
+				used_ids.insert(i->value);
+			}
 		}
-		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);
-	}
-
-	self_referencing = false;
-	assign.right->visit(*this);
-
-	assign.self_referencing = (self_referencing || assign.oper!="=");
-	assign.target_declaration = assignment_target;
-}
-
-void VariableResolver::visit(StructDeclaration &strct)
-{
-	TraversingVisitor::visit(strct);
-	blocks.back()->types[strct.name] = &strct;
-}
-
-void VariableResolver::visit(VariableDeclaration &var)
-{
-	for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
-	{
-		--i;
-		map<string, StructDeclaration *>::iterator j = (*i)->types.find(var.type);
-		if(j!=(*i)->types.end())
-			var.type_declaration = j->second;
-	}
-
-	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 VariableResolver::visit(InterfaceBlock &iface)
-{
-	SetFlag set(anonymous);
-	SetForScope<string> set2(block_interface, iface.interface);
-	TraversingVisitor::visit(iface);
-}
-
-
-void FunctionResolver::visit(FunctionCall &call)
-{
-	map<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
-	if(i!=functions.end())
-		call.declaration = i->second.back();
-
-	TraversingVisitor::visit(call);
-}
-
-void FunctionResolver::visit(FunctionDeclaration &func)
-{
-	vector<FunctionDeclaration *> &decls = functions[func.name];
-	if(func.definition)
-	{
-		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
-			(*i)->definition = func.definition;
-		decls.clear();
-		decls.push_back(&func);
 	}
-	else if(!decls.empty() && decls.back()->definition)
-		func.definition = decls.back()->definition;
-	else
-		decls.push_back(&func);
-
-	TraversingVisitor::visit(func);
 }
 
 
-InterfaceGenerator::InterfaceGenerator():
-	stage(0),
-	scope_level(0)
-{ }
-
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
 {
 	if(type==Stage::VERTEX)
@@ -256,30 +69,24 @@ string InterfaceGenerator::get_out_prefix(Stage::Type type)
 void InterfaceGenerator::apply(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(auto i=block.body.begin(); i!=block.body.end(); ++i)
 	{
-		(*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();
-		}
+		assignment_insert_point = i;
+		if(&block==&stage->content)
+			iface_insert_point = i;
 
-		apply_and_increment(block, i);
+		(*i)->visit(*this);
 	}
 }
 
@@ -289,44 +96,95 @@ 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 && var.interface=="out" && var.array)
+		return 0;
 
 	VariableDeclaration* iface_var = new VariableDeclaration;
 	iface_var->sampling = var.sampling;
+	if(stage->type==Stage::FRAGMENT && iface=="in")
+		if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(var.type_declaration))
+			if(BasicTypeDeclaration *elem = get_element_type(*basic))
+				if(elem->kind==BasicTypeDeclaration::INT)
+					iface_var->interpolation = "flat";
 	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)
+	// Tessellation and geometry inputs may be arrayed.
+	if(stage->type==Stage::TESS_CONTROL)
+		// VS out -> TCS in: add | TCS in -> TCS out: unchanged | VS out -> TCS out: add
+		iface_var->array = (var.array || var.interface!="in");
+	else if(stage->type==Stage::TESS_EVAL)
+		// TCS out -> TES in: unchanged | TES in -> TES out: remove | TCS out -> TES out: remove
+		iface_var->array = (var.array && iface=="in");
+	else if(stage->type==Stage::GEOMETRY)
+		// VS/TES out -> GS in: add | GS in -> GS out: remove | VS/TES out -> GS out: unchanged
 		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;
+	}
+
+	if(var.block_declaration)
+	{
+		StructDeclaration *iface_type = var.block_declaration->clone();
+		iface_type->name = format("_%s_%s", iface, var.block_declaration->block_name);
+		iface_target_block->body.insert(iface_insert_point, iface_type);
+
+		iface_var->type = iface_type->name;
+		if(name.empty())
+			iface_var->name = format("%s %s", iface, var.block_declaration->block_name);
+
+		stage->interface_blocks.insert(make_pair("in "+var.block_declaration->block_name, iface_var));
+		if(!name.empty())
+			stage->interface_blocks.insert(make_pair(name, iface_var));
+	}
 
-	return true;
+	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;
 }
 
 ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
 {
 	Assignment *assign = new Assignment;
+
+	string::size_type dot = left.find('.');
 	VariableReference *ref = new VariableReference;
-	ref->name = left;
+	ref->name = left.substr(0, dot);
 	assign->left = ref;
-	assign->oper = "=";
+
+	while(dot!=string::npos)
+	{
+		string::size_type start = dot+1;
+		dot = left.find('.', start);
+
+		MemberAccess *memacc = new MemberAccess;
+		memacc->left = assign->left;
+		memacc->member = left.substr(start, dot-start);
+		assign->left = memacc;
+	}
+
+	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 +193,53 @@ 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;
+	auto 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;
 	}
+
+	for(const auto &kvp: stage->previous->interface_blocks)
+		if(kvp.second->name.find(' ')!=string::npos)
+		{
+			const map<string, VariableDeclaration *> &iface_vars = kvp.second->block_declaration->members.variables;
+			i = iface_vars.find(var.name);
+			if(i!=iface_vars.end())
+			{
+				generate_interface(*kvp.second, "in", string());
+				return;
+			}
+		}
 }
 
 void 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())))
+		/* 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 +249,31 @@ 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;
+			string name;
+			// Blocks are linked by their block name, not instance name
+			if(var.block_declaration)
+			{
+				prev_vars = &stage->previous->interface_blocks;
+				name = "out "+var.block_declaration->block_name;
+			}
+			else
+			{
+				prev_vars = &stage->previous->content.variables;
+				name = var.name;
+			}
+
+			auto i = prev_vars->find(name);
+			if(i!=prev_vars->end() && i->second->interface=="out")
 			{
 				var.linked_declaration = i->second;
 				i->second->linked_declaration = &var;
@@ -387,176 +284,216 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 	TraversingVisitor::visit(var);
 }
 
-void InterfaceGenerator::visit(Passthrough &pass)
+void InterfaceGenerator::visit(FunctionDeclaration &func)
 {
-	vector<VariableDeclaration *> pass_vars;
+	SetFlag set_scope(function_scope, true);
+	// Skip parameters because they're not useful here
+	func.body.visit(*this);
+}
 
-	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(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)
+		for(const auto &kvp: stage->previous->content.variables)
 		{
-			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(kvp.second->interface!="out")
+				continue;
 
-			if(!linked && generate_interface(*i->second, "in", i->second->name))
-				pass_vars.push_back(i->second);
+			/* Pass through output variables from the previous stage, but only
+			those which are not already linked to an input here. */
+			if(!kvp.second->linked_declaration && generate_interface(*kvp.second, "in", kvp.second->name))
+				pass_vars.push_back(kvp.second);
 		}
 	}
 
 	if(stage->type==Stage::GEOMETRY)
 	{
+		/* Special case for geometry shader: copy gl_Position from input to
+		output. */
 		VariableReference *ref = new VariableReference;
 		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;
 		memacc->member = "gl_Position";
 
-		insert_assignment("gl_Position", memacc);
+		insert_assignment("out gl_PerVertex.gl_Position", memacc);
 	}
 
-	for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
+	for(VariableDeclaration *v: pass_vars)
 	{
-		string out_name = change_prefix((*i)->name, out_prefix);
-		generate_interface(**i, "out", out_name);
+		string out_name = change_prefix(v->name, out_prefix);
+		generate_interface(*v, "out", out_name);
 
 		VariableReference *ref = new VariableReference;
-		ref->name = (*i)->name;
+		ref->name = v->name;
 		if(pass.subscript)
 		{
 			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;
+	nodes_to_remove.insert(&pass);
 }
 
 
-DeclarationReorderer::DeclarationReorderer():
-	scope_level(0),
-	kind(NO_DECLARATION)
-{ }
-
-void DeclarationReorderer::visit(FunctionCall &call)
+void LayoutDefaulter::apply(Stage &stage)
 {
-	FunctionDeclaration *def = call.declaration;
-	if(def)
-		def = def->definition;
-	if(def && !ordered_funcs.count(def))
-		needed_funcs.insert(def);
+	if(stage.type==Stage::TESS_EVAL)
+	{
+		stage.content.visit(*this);
+		if((need_winding || need_spacing) && in_iface)
+		{
+			if(need_winding)
+				in_iface->layout.qualifiers.emplace_back("ccw");
+			if(need_spacing)
+				in_iface->layout.qualifiers.emplace_back("equal_spacing");
+		}
+	}
 }
 
-void DeclarationReorderer::visit(Block &block)
+void LayoutDefaulter::visit(InterfaceLayout &iface)
 {
-	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(); )
+	if(iface.interface=="in")
 	{
-		kind = NO_DECLARATION;
-		(*i)->visit(*this);
-
-		bool moved = false;
-		if(kind==STRUCT && struct_insert_point!=block.body.end())
+		if(!in_iface)
+			in_iface = &iface;
+		for(const Layout::Qualifier &q: iface.layout.qualifiers)
 		{
-			block.body.insert(struct_insert_point, *i);
-			moved = true;
+			if(q.name=="cw" || q.name=="ccw")
+				need_winding = false;
+			else if(q.name=="equal_spacing" || q.name=="fractional_even_spacing" || q.name=="fractional_odd_spacing")
+				need_spacing = false;
 		}
-		else if(kind>STRUCT && struct_insert_point==block.body.end())
-			struct_insert_point = i;
+	}
+}
+
 
-		if(kind==VARIABLE && variable_insert_point!=block.body.end())
+void ArraySizer::apply(Stage &stage)
+{
+	stage.content.visit(*this);
+	for(const auto &kvp: max_indices)
+		if(kvp.first->array && !kvp.first->array_size)
 		{
-			block.body.insert(variable_insert_point, *i);
-			moved = true;
+			int size = 0;
+			if(stage.type==Stage::GEOMETRY && kvp.first->interface=="in")
+				size = input_size;
+			else if(kvp.second>=0)
+				size = kvp.second+1;
+			if(!size && !kvp.first->name.compare(0, 3, "gl_"))
+				size = 1;
+
+			if(size>0)
+			{
+				Literal *literal_size = new Literal;
+				literal_size->token = lexical_cast<string>(size);
+				literal_size->value = size;
+				kvp.first->array_size = literal_size;
+			}
 		}
-		else if(kind>VARIABLE && variable_insert_point==block.body.end())
-			variable_insert_point = i;
+}
 
-		if(kind==FUNCTION)
+void ArraySizer::visit(VariableReference &var)
+{
+	r_declaration = var.declaration;
+}
+
+void ArraySizer::visit(MemberAccess &memacc)
+{
+	r_declaration = 0;
+	TraversingVisitor::visit(memacc);
+	VariableDeclaration *member_declaration = 0;
+	if(r_declaration)
+		if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(r_declaration->type_declaration))
 		{
-			if(function_insert_point==block.body.end())
-				function_insert_point = i;
+			auto i = strct->members.variables.find(memacc.member);
+			if(i!=strct->members.variables.end())
+				member_declaration = i->second;
+		}
+	r_declaration = member_declaration;
+}
+
+void ArraySizer::visit(Swizzle &swizzle)
+{
+	TraversingVisitor::visit(swizzle);
+	r_declaration = 0;
+}
+
+void ArraySizer::visit(UnaryExpression &unary)
+{
+	TraversingVisitor::visit(unary);
+	r_declaration = 0;
+}
 
-			if(needed_funcs.empty())
+void ArraySizer::visit(BinaryExpression &binary)
+{
+	if(binary.oper->token[0]=='[')
+		if(const Literal *literal_index = dynamic_cast<const Literal *>(binary.right.get()))
+			if(literal_index->value.check_type<int>())
 			{
-				ordered_funcs.insert(i->get());
-				if(i!=function_insert_point)
+				r_declaration = 0;
+				binary.left->visit(*this);
+				if(r_declaration)
 				{
-					block.body.insert(function_insert_point, *i);
-					moved = true;
+					max_indices[r_declaration] = literal_index->value.value<int>();
+					return;
 				}
-				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;
+	TraversingVisitor::visit(binary);
+}
 
-		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 ArraySizer::visit(TernaryExpression &ternary)
+{
+	TraversingVisitor::visit(ternary);
+	r_declaration = 0;
 }
 
-void DeclarationReorderer::visit(VariableDeclaration &var)
+void ArraySizer::visit(FunctionCall &call)
 {
-	TraversingVisitor::visit(var);
-	kind = VARIABLE;
+	TraversingVisitor::visit(call);
+	r_declaration = 0;
 }
 
-void DeclarationReorderer::visit(FunctionDeclaration &func)
+void ArraySizer::visit(InterfaceLayout &layout)
 {
-	needed_funcs.clear();
-	func.body.visit(*this);
-	needed_funcs.erase(&func);
-	kind = FUNCTION;
+	if(layout.interface=="in")
+	{
+		for(const Layout::Qualifier &q: layout.layout.qualifiers)
+		{
+			if(q.name=="points")
+				input_size = 1;
+			else if(q.name=="lines")
+				input_size = 2;
+			else if(q.name=="triangles")
+				input_size = 3;
+			else if(q.name=="lines_adjacency")
+				input_size = 4;
+			else if(q.name=="triangles_adjacency")
+				input_size = 6;
+		}
+	}
+}
+
+void ArraySizer::visit(VariableDeclaration &var)
+{
+	if(var.array && !var.array_size)
+		max_indices[&var] = 0;
 }
 
 } // namespace SL