Store types and interface blocks in Stage

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 0577b5ab213f5e67296f87e0285323cc0e361433..fd25bf342a7ea588525be88079166453474c4e8e 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -134,10 +134,11 @@ void NodeRemover::apply(Stage &s, const set<Node *> &tr)
        s.content.visit(*this);
 }
 
-void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, VariableDeclaration &decl)
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-       map<string, VariableDeclaration *>::iterator i = vars.find(decl.name);
-       if(i!=vars.end() && i->second==&decl)
+       typename map<string, T *>::iterator i = vars.find(key);
+       if(i!=vars.end() && i->second==&node)
                vars.erase(i);
 }
 
@@ -157,18 +158,14 @@ void NodeRemover::visit(Block &block)
 void NodeRemover::visit(StructDeclaration &strct)
 {
        if(to_remove->count(&strct))
-               current_block->types.erase(strct.name);
+               remove_from_map(stage->types, strct.name, strct);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
 {
        if(recursive_remove || to_remove->count(&var))
        {
-               remove_variable(current_block->variables, var);
-               if(current_block->anonymous && current_block->parent)
-                       remove_variable(current_block->parent->variables, var);
-               remove_variable(stage->in_variables, var);
-               remove_variable(stage->out_variables, var);
+               remove_from_map(current_block->variables, var.name, var);
                stage->locations.erase(var.name);
                if(var.linked_declaration)
                        var.linked_declaration->linked_declaration = 0;
@@ -179,6 +176,12 @@ void NodeRemover::visit(VariableDeclaration &var)
 
 void NodeRemover::visit(InterfaceBlock &iface)
 {
+       if(to_remove->count(&iface))
+       {
+               remove_from_map(stage->interface_blocks, iface.name, iface);
+               if(!iface.instance_name.empty())
+                       remove_from_map(stage->interface_blocks, iface.instance_name, iface);
+       }
        SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
        TraversingVisitor::visit(iface);
 }