X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=01d34c63cd5f1b0eb99060b59b8abd533f41401f;hb=16c02e4dc3c9a10df15d4ddca2afd29cf3be8d73;hp=29d52364c1506f1dc151aad780c584dc13b0eab6;hpb=a1ba04add302e7712d127b46d8d11386987a0aea;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 29d52364..01d34c63 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;
 			}
 
@@ -591,11 +594,11 @@ void ExpressionResolver::convert_to(RefPtr<Expression> &expr, BasicTypeDeclarati
 
 bool ExpressionResolver::convert_to_element(RefPtr<Expression> &expr, BasicTypeDeclaration &elem_type)
 {
-	if(BasicTypeDeclaration *expr_type = dynamic_cast<BasicTypeDeclaration *>(expr->type))
+	if(BasicTypeDeclaration *expr_basic = dynamic_cast<BasicTypeDeclaration *>(expr->type))
 	{
 		BasicTypeDeclaration *to_type = &elem_type;
-		if(is_vector_or_matrix(*expr_type))
-			to_type = find_type(elem_type, expr_type->kind, expr_type->size);
+		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);
@@ -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;
@@ -1134,8 +1140,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;
 	}