X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=ab487a44c470bca769af032b9ce2966c7a0df5d2;hb=1476e64621ecbd7b17b00ae2c958322fd39918de;hp=09a776afb7f60bb61d2bdc47d0a8f3fb9e470b3e;hpb=30f676460bb6e87fd7ca2532e507b97965c4a407;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 09a776af..ab487a44 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -191,6 +191,9 @@ void TypeResolver::visit(BasicTypeDeclaration &type)
 			if(basic_base->kind==BasicTypeDeclaration::VECTOR)
 			{
 				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;
 			}
 
@@ -1037,6 +1040,9 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 	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;
@@ -1059,6 +1065,8 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 
 	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;
 }
@@ -1134,8 +1142,14 @@ void InterfaceGenerator::visit(VariableReference &var)
 		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;
 	}
 
@@ -1185,11 +1199,13 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 			}
 		}
 	}
-	else if(var.interface=="in")
+	else if(var.interface=="in" && current_block==&stage->content)
 	{
+		declared_inputs.push_back(&var);
+
 		/* Try to link input variables in global scope with output variables from
 		previous stage. */
-		if(current_block==&stage->content && !var.linked_declaration && stage->previous)
+		if(!var.linked_declaration && stage->previous)
 		{
 			const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
 			map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
@@ -1234,12 +1250,8 @@ void InterfaceGenerator::visit(FunctionDeclaration &func)
 
 void InterfaceGenerator::visit(Passthrough &pass)
 {
-	vector<VariableDeclaration *> pass_vars;
-
-	// Pass through all input variables of this stage.
-	for(map<string, VariableDeclaration *>::const_iterator i=stage->content.variables.begin(); i!=stage->content.variables.end(); ++i)
-		if(i->second->interface=="in")
-			pass_vars.push_back(i->second);
+	// Pass through all input variables declared so far.
+	vector<VariableDeclaration *> pass_vars = declared_inputs;
 
 	if(stage->previous)
 	{