Record assignment targets more precisely

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index ed604fffa94849b49efeb34e722b4399f2a88cda..ef9e3e0eafc325a92f3bf389329c3efb3563b738 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);
 }
 
@@ -178,6 +178,16 @@ void DumpTree::visit(MemberAccess &memacc)
        annotated_branch(text, *memacc.left);
 }
 
+void DumpTree::visit(Swizzle &swizzle)
+{
+       static const char components[4] = { 'x', 'y', 'z', 'w' };
+       string text = "Swizzle: .";
+       for(unsigned i=0; i<swizzle.count; ++i)
+               text += components[swizzle.components[i]];
+       text += format(" -> %s", format_type(swizzle.type));
+       annotated_branch(text, *swizzle.left);
+}
+
 void DumpTree::visit(UnaryExpression &unary)
 {
        string text = format("Unary: %s, %sfix -> %s", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"), format_type(unary.type));
@@ -198,8 +208,32 @@ void DumpTree::visit(Assignment &assign)
 {
        append(format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
        begin_sub();
-       if(assign.target_declaration)
-               append(format("Target: %%%d %s %s", get_label(*assign.target_declaration), assign.target_declaration->type, assign.target_declaration->name));
+       if(assign.target.declaration)
+       {
+               string text = format("Target: %%%d", get_label(*assign.target.declaration));
+
+               static const char swizzle[4] = { 'x', 'y', 'z', 'w' };
+               for(unsigned i=0; i<assign.target.chain_len; ++i)
+               {
+                       unsigned component = assign.target.chain[i];
+                       switch(static_cast<Assignment::Target::ChainType>(component&0xC0))
+                       {
+                       case Assignment::Target::MEMBER:
+                               text += format(" .%d", component&0x3F);
+                               break;
+                       case Assignment::Target::SWIZZLE:
+                               text += " .";
+                               for(unsigned j=0; j<4; ++j)
+                                       if(component&(1<<j))
+                                               text += swizzle[j];
+                               break;
+                       case Assignment::Target::ARRAY:
+                               text += format(" [%d]", component&0x3F);
+                               break;
+                       }
+               }
+               append(text);
+       }
        assign.left->visit(*this);
        last_branch();
        assign.right->visit(*this);
@@ -346,7 +380,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)