Transform interface block contents into structs

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index ed604fffa94849b49efeb34e722b4399f2a88cda..ee50bf46e2ccb3af903f44249187cc70a5eb9fb4 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -165,7 +165,7 @@ void DumpTree::visit(InterfaceBlockReference &iface)
        string text;
        if(iface.declaration)
                text += format("%%%d ", get_label(*iface.declaration));
-       text += format("%s (iface)", iface.name);
+       text += format("%s (iface) -> %s", iface.name, format_type(iface.type));
        append(text);
 }
 
@@ -346,7 +346,15 @@ void DumpTree::visit(InterfaceBlock &block)
                head += " (builtin)";
        else if(block.linked_block)
                head += " (linked)";
-       annotated_branch(head, block.members);
+       append(head);
+
+       begin_sub();
+       last_branch();
+       if(block.type_declaration)
+               append(format("Type: %%%d %s", get_label(*block.type_declaration), block.type_declaration->name));
+       else if(block.members)
+               block.members->visit(*this);
+       end_sub();
 }
 
 void DumpTree::visit(FunctionDeclaration &func)