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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 6ce2ee51..67d456a8 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -251,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)
@@ -260,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)
 	{