X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=6ce2ee51400df1668f769c2bc4a086cf61c376f3;hb=eb7ffda6876bd2eeeb64dcb7c82236f36fe5cf43;hp=d154388f98cd9eed44aa8d16c00e1e70d09f801c;hpb=3c8ce91bc0434b3a25eb919fc490c6ff8a8ed67e;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index d154388f..6ce2ee51 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -141,6 +141,18 @@ void DeclarationValidator::visit(Layout &layout)
 			allowed = (iface_block && !variable && iface_block->interface=="uniform");
 			value = false;
 		}
+		else if(i->name=="column_major" || i->name=="row_major")
+		{
+			allowed = (variable && scope==INTERFACE_BLOCK);
+			if(allowed)
+			{
+				BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(variable->type_declaration);
+				while(basic && basic->kind==BasicTypeDeclaration::ARRAY)
+					basic = dynamic_cast<BasicTypeDeclaration *>(basic->base_type);
+				allowed = (basic && basic->kind==BasicTypeDeclaration::MATRIX);
+				err_descr = "non-matrix variable";
+			}
+		}
 
 		if(!allowed)
 		{
@@ -341,7 +353,7 @@ void IdentifierValidator::visit(VariableDeclaration &var)
 
 void IdentifierValidator::visit(InterfaceBlock &iface)
 {
-	string key = iface.interface+iface.block_name;
+	string key = format("%s %s", iface.interface, iface.block_name);
 	map<string, InterfaceBlock *>::const_iterator i = interface_blocks.find(key);
 	if(i!=interface_blocks.end())
 		multiple_definition(format("interface block '%s %s'", iface.interface, iface.block_name), iface, *i->second);