Support layout qualifiers on GLSL interface blocks

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 99d6edaaa0ab7b7f242e23c0ecc9fc2c04be47df..810ac742f43e906580d8abe6f69c136514df4dc4 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -388,13 +388,14 @@ void DumpTree::visit(InterfaceBlock &iface)
                head += " (linked)";
        append(head);
 
-       begin_sub();
-       last_branch();
+       vector<Branch> branches;
        if(iface.type_declaration)
                append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
-       else if(iface.members)
-               iface.members->visit(*this);
-       end_sub();
+       if(iface.layout)
+               branches.push_back(Branch("Layout", iface.layout.get()));
+       if(iface.members)
+               branches.push_back(Branch("Members", iface.members.get()));
+       append_subtree(branches);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)