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 e9eb18c819d00522e4877f49dd04f51b582d2352..bd3404e56f0fae10addb22fb90f3aec2f234560c 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -8,24 +8,17 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-const std::string &DumpTree::apply(Stage &stage)
+std::string DumpTree::apply(Stage &stage)
 {
        formatted = format("Stage: %s\n", Stage::get_stage_name(stage.type));
-       tree.push_back(BRANCH);
+       begin_sub();
        append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 
        for(std::map<string, TypeDeclaration *>::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i)
                append(format("Type: %%%d %s", get_label(*i->second), i->first));
 
-       set<InterfaceBlock *> seen_interfaces;
        for(std::map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
-               if(seen_interfaces.insert(i->second).second)
-               {
-                       string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->block_name);
-                       if(!i->second->instance_name.empty())
-                               text += format(" %s", i->second->instance_name);
-                       append(text);
-               }
+               append(format("Interface block: %%%d %s", get_label(*i->second), i->first));
 
        for(std::map<string, FunctionDeclaration *>::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i)
                append(format("Function: %%%d %s", get_label(*i->second), i->first));
@@ -60,10 +53,14 @@ void DumpTree::append_subtree(const vector<Branch> &branches)
                vector<Branch>::const_iterator j = increment(i, branches);
                if(!j->text.empty())
                {
+                       append(j->text);
                        if(j->node)
-                               annotated_branch(j->text, *j->node);
-                       else
-                               append(j->text);
+                       {
+                               begin_sub();
+                               last_branch();
+                               j->node->visit(*this);
+                               end_sub();
+                       }
                }
                else
                        j->node->visit(*this);
@@ -81,7 +78,8 @@ void DumpTree::append_subtree(Node &node)
 
 void DumpTree::begin_sub()
 {
-       tree.back() = (tree.back()==BRANCH_LAST ? EMPTY : STRAIGHT);
+       if(!tree.empty())
+               tree.back() = (tree.back()==BRANCH_LAST ? EMPTY : STRAIGHT);
        tree.push_back(BRANCH);
 }
 
@@ -93,19 +91,10 @@ void DumpTree::last_branch()
 void DumpTree::end_sub()
 {
        tree.pop_back();
-       if(tree.back()==STRAIGHT)
+       if(!tree.empty() && tree.back()==STRAIGHT)
                tree.back() = BRANCH;
 }
 
-void DumpTree::annotated_branch(const string &annotation, Node &node)
-{
-       append(annotation);
-       begin_sub();
-       last_branch();
-       node.visit(*this);
-       end_sub();
-}
-
 unsigned DumpTree::get_label(const Node &node)
 {
        unsigned &label = node_labels[&node];
@@ -136,20 +125,11 @@ void DumpTree::visit(Block &block)
        for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
                append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
 
-       bool labeled_body = !block.variables.empty();
-       if(labeled_body)
-       {
-               last_branch();
-               append("Body");
-               begin_sub();
-       }
        for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )
        {
                NodeList<Statement>::const_iterator j = increment(i, block.body);
                (*j)->visit(*this);
        }
-       if(labeled_body)
-               end_sub();
 
        end_sub();
 }
@@ -182,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);
 }
@@ -393,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)
@@ -409,11 +386,11 @@ void DumpTree::visit(InterfaceBlock &iface)
 
        vector<Branch> branches;
        if(iface.type_declaration)
-               append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
+               branches.push_back(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
        if(iface.layout)
-               branches.push_back(Branch("Layout", iface.layout.get()));
+               branches.push_back(iface.layout.get());
        if(iface.members)
-               branches.push_back(Branch("Members", iface.members.get()));
+               branches.push_back(iface.members.get());
        append_subtree(branches);
 }
 
@@ -445,9 +422,9 @@ void DumpTree::visit(Conditional &cond)
 
        vector<Branch> branches;
        branches.push_back(cond.condition.get());
-       branches.push_back(&cond.body);
+       branches.push_back(Branch("then", &cond.body));
        if(!cond.else_body.body.empty())
-               branches.push_back(&cond.else_body);
+               branches.push_back(Branch("else", &cond.else_body));
        append_subtree(branches);
 }
 
@@ -455,16 +432,15 @@ void DumpTree::visit(Iteration &iter)
 {
        append(iter, "for()");
 
-       begin_sub();
+       vector<Branch> branches;
        if(iter.init_statement)
-               annotated_branch("Initialization", *iter.init_statement);
+               branches.push_back(Branch("Initialization", iter.init_statement.get()));
        if(iter.condition)
-               annotated_branch("Condition", *iter.condition);
+               branches.push_back(Branch("Condition", iter.condition.get()));
        if(iter.loop_expression)
-               annotated_branch("Loop", *iter.loop_expression);
-       last_branch();
-       annotated_branch("Body", iter.body);
-       end_sub();
+               branches.push_back(Branch("Loop", iter.loop_expression.get()));
+       branches.push_back(&iter.body);
+       append_subtree(branches);
 }
 
 void DumpTree::visit(Passthrough &pass)