Transform interface block contents into structs

[libs/gl.git] / source / glsl / validate.cpp

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 676dd9e808792867458d8c59d03a62d47ceb8e88..b0c6e3d67acb29cb178bbdeb1e7d2812ea16f5be 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "validate.h"
@@ -148,18 +149,28 @@ 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)
 {
        if(Statement *previous = find_definition(func.name))
-               if(!dynamic_cast<FunctionDeclaration *>(previous))
+       {
+               FunctionDeclaration *prev_func = dynamic_cast<FunctionDeclaration *>(previous);
+               if(prev_func && prev_func->definition==&func)
+                       declarations[current_block][func.name] = &func;
+               else
                        multiple_definition(format("'%s'", func.name), func, *previous);
+       }
+       else
+               record_definition(func.name, func);
 
-       if(func.definition==&func)
-               check_definition(func.name, func);
        TraversingVisitor::visit(func);
 }
 
@@ -201,6 +212,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)
@@ -231,18 +249,30 @@ void ExpressionValidator::visit(BinaryExpression &binary)
 
 void ExpressionValidator::visit(Assignment &assign)
 {
-       if(assign.left->type && !assign.left->lvalue)
-               error(assign, "Target of assignment is not an lvalue");
-       if(assign.left->type && assign.right->type && assign.left->type!=assign.right->type)
-               error(assign, format("Assignment to variable of type '%s' from expression of type '%s'",
-                       assign.left->type->name, assign.right->type->name));
+       if(assign.left->type)
+       {
+               if(!assign.left->lvalue)
+                       error(assign, "Target of assignment is not an lvalue");
+               if(assign.right->type)
+               {
+                       if(assign.oper->token[0]!='=')
+                       {
+                               if(!assign.type)
+                                       error(assign, format("No matching operator '%s' found for '%s' and '%s'",
+                                               string(assign.oper->token, strlen(assign.oper->token)-1), assign.left->type->name, assign.right->type->name));
+                       }
+                       else if(assign.left->type!=assign.right->type)
+                               error(assign, format("Assignment to variable of type '%s' from expression of incompatible type '%s'",
+                                       assign.left->type->name, assign.right->type->name));
+               }
+       }
        TraversingVisitor::visit(assign);
 }
 
 void ExpressionValidator::visit(VariableDeclaration &var)
 {
        if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
-               error(var, format("Initializing a variable of type '%s' with an expression of type '%s'",
+               error(var, format("Initializing a variable of type '%s' with an expression of incompatible type '%s'",
                        var.type_declaration->name, var.init_expression->type->name));
        TraversingVisitor::visit(var);
 }