Improve support for interface blocks

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 018408c7a74d83b8974a7252061b40ab72695eb6..62cf7a94701ec04169c39748fbad6c84b46d58d2 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -85,8 +85,15 @@ void DumpTree::visit(Block &block)
        for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
                append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
 
-       for(std::set<InterfaceBlock *>::const_iterator i=block.interfaces.begin(); i!=block.interfaces.end(); ++i)
-               append(format("Interface: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name));
+       set<InterfaceBlock *> seen_interfaces;
+       for(std::map<string, InterfaceBlock *>::const_iterator i=block.interfaces.begin(); i!=block.interfaces.end(); ++i)
+               if(seen_interfaces.insert(i->second).second)
+               {
+                       string text = format("Interface: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name);
+                       if(!i->second->instance_name.empty())
+                               text += format(" %s", i->second->instance_name);
+                       append(text);
+               }
 
        bool labeled_body = (!block.types.empty() || !block.variables.empty());
        if(labeled_body)
@@ -121,7 +128,16 @@ void DumpTree::visit(VariableReference &var)
        string text;
        if(var.declaration)
                text += format("%%%d ", get_label(*var.declaration));
-       text += var.name;
+       text += format("%s (var)", var.name);
+       append(text);
+}
+
+void DumpTree::visit(InterfaceBlockReference &iface)
+{
+       string text;
+       if(iface.declaration)
+               text += format("%%%d ", get_label(*iface.declaration));
+       text += format("%s (iface)", iface.name);
        append(text);
 }
 
@@ -264,7 +280,17 @@ void DumpTree::visit(VariableDeclaration &var)
 
 void DumpTree::visit(InterfaceBlock &block)
 {
-       annotated_branch(format("%s %s", block.interface, block.name), block.members);
+       string head;
+       if(!block.instance_name.empty())
+               head += format("%%%d ", get_label(block));
+       head += format("%s %s", block.interface, block.name);
+       if(!block.instance_name.empty())
+               head += format(" %s", block.instance_name);
+       if(block.array)
+               head += "[]";
+       if(block.linked_block)
+               head += " (linked)";
+       annotated_branch(head, block.members);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)