Validate struct name uniqueness

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 5fd4ebcae76a8d050285fcb17c48336dbfce315b..1e967dc88f6f4d54f0e54f9a1f90cb499aaf7c86 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -63,6 +63,12 @@ void DeclarationValidator::record_definition(const string &name, Statement &stat
                declarations[current_block->parent].insert(make_pair(name, &statement));
 }
 
+void DeclarationValidator::visit(StructDeclaration &strct)
+{
+       check_definition(strct.name, strct);
+       TraversingVisitor::visit(strct);
+}
+
 void DeclarationValidator::visit(VariableDeclaration &var)
 {
        check_definition(var.name, var);
@@ -95,6 +101,10 @@ void DeclarationValidator::visit(InterfaceBlock &iface)
 
 void DeclarationValidator::visit(FunctionDeclaration &func)
 {
+       if(Statement *previous = find_definition(func.name))
+               if(!dynamic_cast<FunctionDeclaration *>(previous))
+                       multiple_definition(format("'%s'", func.name), func, *previous);
+
        if(func.definition==&func)
                check_definition(func.name, func);
        TraversingVisitor::visit(func);