Rename InterfaceBlock::name to block_name for clarity

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 308fbad73225999efa4a742e2d5ad679b9f80a50..99d6edaaa0ab7b7f242e23c0ecc9fc2c04be47df 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -21,7 +21,7 @@ const std::string &DumpTree::apply(Stage &stage)
        for(std::map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
                if(seen_interfaces.insert(i->second).second)
                {
-                       string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name);
+                       string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->block_name);
                        if(!i->second->instance_name.empty())
                                text += format(" %s", i->second->instance_name);
                        append(text);
@@ -377,7 +377,7 @@ void DumpTree::visit(InterfaceBlock &iface)
        string head;
        if(!iface.instance_name.empty())
                head += format("%%%d ", get_label(iface));
-       head += format("%s %s", iface.interface, iface.name);
+       head += format("%s %s", iface.interface, iface.block_name);
        if(!iface.instance_name.empty())
                head += format(" %s", iface.instance_name);
        if(iface.array)