Fix GLSL member access index calculation

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index c02d914720a35707d2e40d167d31f0538f7ec901..bd3404e56f0fae10addb22fb90f3aec2f234560c 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -162,7 +162,7 @@ void DumpTree::visit(MemberAccess &memacc)
        string text = "Member access:";
        if(memacc.declaration)
                text += format(" %%%d", get_label(*memacc.declaration));
-       text += format(" .%s -> %s", memacc.member, format_type(memacc.type));
+       text += format(" .%s (%d) -> %s", memacc.member, memacc.index, format_type(memacc.type));
        append(memacc, text);
        append_subtree(*memacc.left);
 }
@@ -373,10 +373,7 @@ void DumpTree::visit(VariableDeclaration &var)
 
 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.block_name);
+       string head = format("%%%d %s %s", get_label(iface), iface.interface, iface.block_name);
        if(!iface.instance_name.empty())
                head += format(" %s", iface.instance_name);
        if(iface.array)