Some tweaks to GLSL debug output

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 0a5b6ef375be2efccb77261fdf6c9e124c4f2b05..6bf6eef9feb818276d6863262fa0bb71c3a797a4 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -127,7 +127,11 @@ void DumpTree::visit(VariableReference &var)
 
 void DumpTree::visit(MemberAccess &memacc)
 {
-       annotated_branch(format("Member access: .%s", memacc.member), *memacc.left);
+       string text = "Member access:";
+       if(memacc.declaration)
+               text += format(" %%%d", get_label(*memacc.declaration));
+       text += format(" .%s", memacc.member);
+       annotated_branch(text, *memacc.left);
 }
 
 void DumpTree::visit(UnaryExpression &unary)
@@ -196,9 +200,9 @@ void DumpTree::visit(Layout &layout)
        for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); )
        {
                vector<Layout::Qualifier>::const_iterator j = increment(i, layout.qualifiers);
-               string qualifier = j->identifier;
-               if(!j->value.empty())
-                       qualifier += format("=%s", j->value);
+               string qualifier = j->name;
+               if(j->has_value)
+                       qualifier += format("=%d", j->value);
                append(qualifier);
        }
        end_sub();
@@ -241,7 +245,12 @@ void DumpTree::visit(VariableDeclaration &var)
        if(!var.init_expression)
                last_branch();
        if(var.array)
-               annotated_branch("Array []", *var.array_size);
+       {
+               if(var.array_size)
+                       annotated_branch("Array []", *var.array_size);
+               else
+                       append("Array []");
+       }
 
        last_branch();
        if(var.init_expression)
@@ -300,6 +309,18 @@ void DumpTree::visit(Iteration &iter)
        end_sub();
 }
 
+void DumpTree::visit(Passthrough &pass)
+{
+       append("passthrough");
+       if(pass.subscript)
+       {
+               begin_sub();
+               last_branch();
+               pass.subscript->visit(*this);
+               end_sub();
+       }
+}
+
 void DumpTree::visit(Return &ret)
 {
        if(ret.expression)