X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=6151483cbd640d2fcc09c08b5294f69a199e21c3;hb=2b1dc627491c987b0459226dcb8ac6aadd7ee4d3;hp=f43217ce6314c24a00d1e5885c6f405e129fba38;hpb=03b2ea5c9c611cfa5f02afb49ed7e05743e691b4;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index f43217ce..6151483c 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -156,6 +156,20 @@ void DeclarationValidator::visit(Layout &layout)
 			allowed = (iface_block && !variable && iface_block->interface=="uniform");
 			value = false;
 		}
+		else if(q.name=="rgba32f" || q.name=="rgba16f" || q.name=="rg32f" || q.name=="rg16f" || q.name=="r32f" || q.name=="r16f" ||
+			q.name=="rgba16" || q.name=="rgba8" || q.name=="rg16" || q.name=="rg8" || q.name=="r16" || q.name=="r8" ||
+			q.name=="rgba16_snorm" || q.name=="rgba8_snorm" || q.name=="rg16_snorm" || q.name=="rg8_snorm" || q.name=="r16_snorm" || q.name=="r8_snorm")
+		{
+			allowed = variable;
+			value = false;
+			if(allowed)
+			{
+				const TypeDeclaration *base_type = get_ultimate_base_type(variable->type_declaration);
+				const ImageTypeDeclaration *image = dynamic_cast<const ImageTypeDeclaration *>(base_type);
+				allowed = (image && !image->sampled);
+				err_descr = (image ? "sampled image" : "non-image variable");
+			}
+		}
 
 		if(!allowed)
 		{
@@ -293,6 +307,9 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 			error(var, "Type 'bool' not allowed on interface variable");
 	}
 
+	if(var.array && !var.array_size)
+		error(var, "Array must have a size");
+
 	if(var.init_expression)
 	{
 		if(scope==GLOBAL && !var.constant)