X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=ea2e956d023f1e02d66b44b7771186542076dd28;hb=d18df036b247f7f0978b547bb8ea1d624af2c4b2;hp=fcccb526e0dc3bc62831e3c949f8bb767b929591;hpb=01c59fefa142fe7812db32e703bbe52a0c14a2bb;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index fcccb526..ea2e956d 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <cstring>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
@@ -10,17 +11,29 @@ namespace GL {
 namespace SL {
 
 Validator::Validator():
-	stage(0)
+	stage(0),
+	last_provoker(0)
 { }
 
-void Validator::diagnose(Node &node, Diagnostic::Severity severity, const string &message)
+void Validator::diagnose(Node &node, Node &provoking_node, Diagnostic::Severity severity, const string &message)
 {
 	Diagnostic diag;
 	diag.severity = severity;
 	diag.source = node.source;
 	diag.line = node.line;
+	diag.provoking_source = provoking_node.source;
+	diag.provoking_line = provoking_node.line;
 	diag.message = message;
 	stage->diagnostics.push_back(diag);
+
+	last_provoker = &provoking_node;
+}
+
+void Validator::add_info(Node &node, const string &message)
+{
+	if(!last_provoker)
+		throw logic_error("Tried to add info without a previous provoker");
+	diagnose(node, *last_provoker, Diagnostic::INFO, message);
 }
 
 
@@ -82,7 +95,7 @@ DeclarationValidator::DeclarationValidator():
 void DeclarationValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
 {
 	error(statement, format("Multiple definition of %s", name));
-	diagnose(previous, Diagnostic::INFO, "Previous definition is here");
+	add_info(previous, "Previous definition is here");
 }
 
 Statement *DeclarationValidator::find_definition(const string &name)
@@ -149,8 +162,13 @@ void DeclarationValidator::visit(InterfaceBlock &iface)
 	if(!iface.instance_name.empty())
 		check_definition(iface.instance_name, iface);
 
-	SetFlag set_anon(anonymous_block, iface.instance_name.empty());
-	TraversingVisitor::visit(iface);
+	if(iface.instance_name.empty() && iface.struct_declaration)
+	{
+		// Inject anonymous interface block members into the global scope
+		const map<string, VariableDeclaration *> &iface_vars = iface.struct_declaration->members.variables;
+		for(map<string, VariableDeclaration *>::const_iterator j=iface_vars.begin(); j!=iface_vars.end(); ++j)
+			check_definition(j->first, *j->second);
+	}
 }
 
 void DeclarationValidator::visit(FunctionDeclaration &func)
@@ -190,6 +208,13 @@ void ReferenceValidator::visit(VariableReference &var)
 		error(var, format("Use of unlinked input variable '%s'", var.name));
 }
 
+void ReferenceValidator::visit(MemberAccess &memacc)
+{
+	if(memacc.left->type && !memacc.declaration)
+		error(memacc, format("Use of undeclared member '%s'", memacc.member));
+	TraversingVisitor::visit(memacc);
+}
+
 void ReferenceValidator::visit(InterfaceBlockReference &iface)
 {
 	/* An interface block reference without a declaration should be impossible
@@ -207,6 +232,13 @@ void ReferenceValidator::visit(VariableDeclaration &var)
 	TraversingVisitor::visit(var);
 }
 
+void ReferenceValidator::visit(InterfaceBlock &iface)
+{
+	if(!iface.struct_declaration)
+		error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.name));
+	TraversingVisitor::visit(iface);
+}
+
 void ReferenceValidator::visit(FunctionDeclaration &func)
 {
 	if(!func.return_type_declaration)
@@ -215,6 +247,44 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 }
 
 
+void ExpressionValidator::visit(Swizzle &swizzle)
+{
+	unsigned size = 0;
+	if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(swizzle.left->type))
+	{
+		if(basic->kind==BasicTypeDeclaration::INT || basic->kind==BasicTypeDeclaration::FLOAT)
+			size = 1;
+		else if(basic->kind==BasicTypeDeclaration::VECTOR)
+			size = basic->size;
+	}
+
+	if(size)
+	{
+		static const char component_names[] = { 'x', 'y', 'z', 'w', 'r', 'g', 'b', 'a', 's', 't', 'p', 'q' };
+		int flavour = -1;
+		for(unsigned i=0; i<swizzle.count; ++i)
+		{
+			unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+			if(flavour==-1)
+				flavour = component_flavour;
+			else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
+			{
+				error(swizzle, format("Flavour of swizzle component '%c' is inconsistent with '%c'",
+					swizzle.component_group[i], swizzle.component_group[0]));
+				flavour = -2;
+			}
+
+			if(swizzle.components[i]>=size)
+				error(swizzle, format("Access to component '%c' which is not present in '%s'",
+					swizzle.component_group[i], swizzle.left->type->name));
+		}
+	}
+	else if(swizzle.left->type)
+		error(swizzle, format("Swizzle applied to '%s' which is neither a scalar nor a vector", swizzle.left->type->name));
+
+	TraversingVisitor::visit(swizzle);
+}
+
 void ExpressionValidator::visit(UnaryExpression &unary)
 {
 	if(unary.expression->type)