X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=4b38c5b755e935f0e3f477c0ecd092202e411c7f;hb=ff3b43b6c15c3331d156b147b559892ee7ccdacb;hp=6e90698c97b500c5dd2edcaebd7e3f8c70e90026;hpb=3a1fe833ea04df75449706f1d773f6e65521a392;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 6e90698c..4b38c5b7 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -216,7 +216,7 @@ 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)
+	else if(stage->type!=Stage::VERTEX && var.declaration->interface=="in" && var.name.compare(0, 3, "gl_") && !var.declaration->linked_declaration)
 		error(var, format("Use of unlinked input variable '%s'", var.name));
 }
 
@@ -338,8 +338,14 @@ void ExpressionValidator::visit(UnaryExpression &unary)
 void ExpressionValidator::visit(BinaryExpression &binary)
 {
 	if(!binary.type && binary.left->type && binary.right->type)
-		error(binary, format("No matching operator '%s' found for '%s' and '%s'",
-			binary.oper->token, binary.left->type->name, binary.right->type->name));
+	{
+		if(binary.oper->token[0]=='[')
+			error(binary, format("Can't index element of '%s' with '%s'",
+				binary.left->type->name, binary.right->type->name));
+		else
+			error(binary, format("No matching operator '%s' found for '%s' and '%s'",
+				binary.oper->token, binary.left->type->name, binary.right->type->name));
+	}
 	TraversingVisitor::visit(binary);
 }