X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=67d456a8a2a1d6abb3bc8253bab72a9ab2cac2ab;hb=7156c64692b7919b487d7fe2d7aa75430a2e53bb;hp=7e5f295f165ac3eda0993a7767b2b29fa9b6bbc5;hpb=d3a41542c4982d6df08b5e6f969267f9c8889f9f;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 7e5f295f..67d456a8 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)
 		{
@@ -216,6 +228,8 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 	{
 		if(scope==STRUCT || scope==INTERFACE_BLOCK)
 			error(var, format("Constant qualifier not allowed on %s", descr));
+		if(!var.init_expression)
+			error(var, "Constant variable must have an initializer");
 	}
 
 	if(!var.interpolation.empty() || !var.sampling.empty())
@@ -237,8 +251,12 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 	}
 
 	TypeDeclaration *type = var.type_declaration;
+	BasicTypeDeclaration::Kind kind = BasicTypeDeclaration::ALIAS;
 	while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
+	{
+		kind = basic->kind;
 		type = basic->base_type;
+	}
 	if(dynamic_cast<ImageTypeDeclaration *>(type))
 	{
 		if(scope!=GLOBAL && scope!=FUNCTION_PARAM)
@@ -246,6 +264,10 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 		else if(scope==GLOBAL && var.interface!="uniform")
 			error(var, format("Type '%s' only allowed with uniform interface", type->name));
 	}
+	else if(kind==BasicTypeDeclaration::VOID)
+		error(var, "Type 'void' not allowed on variable");
+	else if(kind==BasicTypeDeclaration::BOOL && !var.interface.empty() && var.source!=BUILTIN_SOURCE)
+		error(var, "Type 'bool' not allowed on interface variable");
 
 	if(var.init_expression)
 	{
@@ -339,7 +361,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);