X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fvisitor.cpp;h=d8b1813959f17e4535ea1ea8c60001c22a36d76f;hb=3f899b1fc2e04f4fe74c99ad3e8ebb900c257214;hp=051d92f6adfc1e48f9117a32797d3004f9759e10;hpb=bd8816692056230c36504dcccd76c6946dff47b1;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 051d92f6..d8b18139 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -158,7 +158,7 @@ void NodeRemover::visit(Block &block)
 void NodeRemover::visit(StructDeclaration &strct)
 {
 	if(to_remove->count(&strct))
-		remove_from_map(current_block->types, strct.name, strct);
+		remove_from_map(stage->types, strct.name, strct);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
@@ -178,14 +178,21 @@ void NodeRemover::visit(InterfaceBlock &iface)
 {
 	if(to_remove->count(&iface))
 	{
-		remove_from_map(current_block->interfaces, iface.name, iface);
+		remove_from_map(stage->interface_blocks, iface.name, iface);
 		if(!iface.instance_name.empty())
-			remove_from_map(current_block->interfaces, iface.instance_name, iface);
+			remove_from_map(stage->interface_blocks, iface.instance_name, iface);
 	}
 	SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
 	TraversingVisitor::visit(iface);
 }
 
+void NodeRemover::visit(FunctionDeclaration &func)
+{
+	if(to_remove->count(&func))
+		remove_from_map(stage->functions, func.name+func.signature, func);
+	TraversingVisitor::visit(func);
+}
+
 void NodeRemover::visit(Iteration &iter)
 {
 	if(to_remove->count(iter.init_statement.get()))