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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 7e5f295f..b313354d 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())