Rename InterfaceBlock::name to block_name for clarity

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index b8710509e8d32fe424062f6c6558976ceab6da35..99e2dfe86c954d31a5a8e734a78b92a9ea3bc283 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -145,20 +145,20 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 
 void DeclarationValidator::visit(InterfaceBlock &iface)
 {
-       string key = iface.interface+iface.name;
+       string key = iface.interface+iface.block_name;
        map<string, InterfaceBlock *>::const_iterator i = interface_blocks.find(key);
        if(i!=interface_blocks.end())
-               multiple_definition(format("interface block '%s %s'", iface.interface, iface.name), iface, *i->second);
+               multiple_definition(format("interface block '%s %s'", iface.interface, iface.block_name), iface, *i->second);
        else
                interface_blocks.insert(make_pair(key, &iface));
 
-       if(Statement *previous = find_definition(iface.name))
+       if(Statement *previous = find_definition(iface.block_name))
        {
                if(!dynamic_cast<InterfaceBlock *>(previous))
-                       multiple_definition(format("'%s'", iface.name), iface, *previous);
+                       multiple_definition(format("'%s'", iface.block_name), iface, *previous);
        }
        else
-               record_definition(iface.name, iface);
+               record_definition(iface.block_name, iface);
 
        if(!iface.instance_name.empty())
                check_definition(iface.instance_name, iface);
@@ -279,7 +279,7 @@ void ReferenceValidator::visit(VariableDeclaration &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));
+               error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.block_name));
        TraversingVisitor::visit(iface);
 }