Output the passthrough statement in both GLSL and debug modes

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 0a5b6ef375be2efccb77261fdf6c9e124c4f2b05..4de8ac90ad927ed05175923827a25895ab176d71 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -196,9 +196,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();
@@ -300,6 +300,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)