Don't return references from apply functions

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 2e8433f28287713ca215c0a33e0df669cd6b1f55..2f243dc73dc0d25518ce341597749f4255f45d8a 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -8,7 +8,7 @@ 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);
@@ -17,15 +17,8 @@ const std::string &DumpTree::apply(Stage &stage)
        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));
@@ -395,7 +388,7 @@ 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(iface.layout.get());
        if(iface.members)