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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 7235e223..6ce2ee51 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -81,11 +81,15 @@ void DeclarationValidator::visit(Layout &layout)
 				TypeDeclaration *type = variable->type_declaration;
 				while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
 					type = basic->base_type;
-				allowed = (scope==GLOBAL && dynamic_cast<ImageTypeDeclaration *>(type));
-				err_descr = "variable of non-opaque type";
+				bool uniform = (variable->interface=="uniform");
+				allowed = (scope==GLOBAL && uniform && dynamic_cast<ImageTypeDeclaration *>(type));
+				err_descr = (uniform ? "variable of non-opaque type" : "non-uniform variable");
 			}
 			else if(iface_block)
-				allowed = true;
+			{
+				allowed = (iface_block->interface=="uniform");
+				err_descr = "non-uniform interface block";
+			}
 		}
 		else if(i->name=="constant_id")
 		{
@@ -110,7 +114,9 @@ void DeclarationValidator::visit(Layout &layout)
 			}
 		}
 		else if(i->name=="offset")
-			allowed = (variable && scope==INTERFACE_BLOCK);
+			allowed = (variable && scope==INTERFACE_BLOCK && iface_block->interface=="uniform");
+		else if(i->name=="align")
+			allowed = (scope==INTERFACE_BLOCK && iface_block->interface=="uniform");
 		else if(i->name=="points")
 		{
 			allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out"));
@@ -135,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)
 		{
@@ -210,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())
@@ -333,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);