X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=e6f0c653e45f4ad9e62c108084867dc4374c11c9;hb=ff00056daddbce2e6e16f7c09dcfcb5cde66e85c;hp=78d3bb4be6a82ba919ef2a6dca4d61fc232fd5de;hpb=a82fcc462550d63a101aca4313807b1320789a5a;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 78d3bb4b..e6f0c653 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -23,6 +23,57 @@ void Validator::diagnose(Node &node, Diagnostic::Severity severity, const string
 }
 
 
+TypeValidator::TypeValidator():
+	in_struct(false)
+{ }
+
+void TypeValidator::visit(BasicTypeDeclaration &type)
+{
+	if(type.kind==BasicTypeDeclaration::VECTOR)
+	{
+		BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+		if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+			base_kind = basic_base->kind;
+		if(base_kind!=BasicTypeDeclaration::BOOL && base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+			error(type, format("Invalid base type '%s' for vector type '%s'", type.base, type.name));
+	}
+	else if(type.kind==BasicTypeDeclaration::ARRAY)
+	{
+		if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+			if(basic_base->kind==BasicTypeDeclaration::VOID)
+				error(type, format("Invalid base type '%s' for array type '%s'", type.base, type.name));
+	}
+}
+
+void TypeValidator::visit(ImageTypeDeclaration &type)
+{
+	BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+	if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+		base_kind = basic_base->kind;
+	if(base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+		error(type, format("Invalid base type '%s' for image type '%s'", type.base, type.name));
+}
+
+void TypeValidator::visit(StructDeclaration &strct)
+{
+	SetFlag set_struct(in_struct);
+	TraversingVisitor::visit(strct);
+}
+
+void TypeValidator::visit(VariableDeclaration &var)
+{
+	if(in_struct)
+	{
+		if(var.layout)
+			error(var, "Struct members can't have layouts");
+		if(var.init_expression)
+			error(var, "Struct members can't have initializers");
+	}
+
+	TraversingVisitor::visit(var);
+}
+
+
 DeclarationValidator::DeclarationValidator():
 	anonymous_block(false)
 { }
@@ -60,6 +111,11 @@ void DeclarationValidator::record_definition(const string &name, Statement &stat
 		declarations[current_block->parent].insert(make_pair(name, &statement));
 }
 
+void DeclarationValidator::visit(TypeDeclaration &type)
+{
+	check_definition(type.name, type);
+}
+
 void DeclarationValidator::visit(StructDeclaration &strct)
 {
 	check_definition(strct.name, strct);
@@ -107,6 +163,51 @@ void DeclarationValidator::visit(FunctionDeclaration &func)
 	TraversingVisitor::visit(func);
 }
 
+
+void ReferenceValidator::visit(BasicTypeDeclaration &type)
+{
+	if(!type.base.empty() && !type.base_type)
+		error(type, format("Use of undeclared type '%s'", type.base));
+}
+
+void ReferenceValidator::visit(ImageTypeDeclaration &type)
+{
+	if(!type.base.empty() && !type.base_type)
+		error(type, format("Use of undeclared type '%s'", type.base));
+}
+
+void ReferenceValidator::visit(VariableReference &var)
+{
+	if(!var.declaration)
+		error(var, format("Use of undeclared variable '%s'", var.name));
+	else if(stage->type!=Stage::VERTEX && var.declaration->interface=="in" && !var.declaration->linked_declaration)
+		error(var, format("Use of unlinked input variable '%s'", var.name));
+}
+
+void ReferenceValidator::visit(InterfaceBlockReference &iface)
+{
+	/* An interface block reference without a declaration should be impossible
+	since references are generated based on existing declarations. */
+	if(!iface.declaration)
+		error(iface, format("Use of undeclared interface block '%s'", iface.name));
+	else if(stage->type!=Stage::VERTEX && iface.declaration->interface=="in" && !iface.declaration->linked_block)
+		error(iface, format("Use of unlinked input block '%s'", iface.name));
+}
+
+void ReferenceValidator::visit(VariableDeclaration &var)
+{
+	if(!var.type_declaration)
+		error(var, format("Use of undeclared type '%s'", var.type));
+	TraversingVisitor::visit(var);
+}
+
+void ReferenceValidator::visit(FunctionDeclaration &func)
+{
+	if(!func.return_type_declaration)
+		error(func, format("Use of undeclared type '%s'", func.return_type));
+	TraversingVisitor::visit(func);
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp