X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=bcd6051a7c4a65b13604a5e75ec63eeed9c8de7b;hp=5e56d91945f057a3a1013a9fe8c233d475926dc7;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hpb=e9a898f315b5d1396f196d785913a283c30940f2

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 5e56d919..bcd6051a 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -86,14 +86,6 @@ void TraversingVisitor::visit(VariableDeclaration &var)
 		visit(var.array_size);
 }
 
-void TraversingVisitor::visit(InterfaceBlock &iface)
-{
-	if(iface.layout)
-		iface.layout->visit(*this);
-	if(iface.members)
-		iface.members->visit(*this);
-}
-
 void TraversingVisitor::visit(FunctionDeclaration &func)
 {
 	enter(func.body);
@@ -136,12 +128,6 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-NodeRemover::NodeRemover():
-	stage(0),
-	to_remove(0),
-	recursive_remove(false)
-{ }
-
 void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
 	stage = &s;
@@ -176,11 +162,32 @@ void NodeRemover::visit(TypeDeclaration &type)
 		remove_from_map(stage->types, type.name, type);
 }
 
+void NodeRemover::visit(StructDeclaration &strct)
+{
+	if(to_remove->count(&strct))
+	{
+		remove_from_map<TypeDeclaration>(stage->types, strct.name, strct);
+		if(strct.block_declaration)
+		{
+			string key = format("%s %s", strct.block_declaration->interface, strct.block_name);
+			remove_from_map(stage->interface_blocks, key, *strct.block_declaration);
+			remove_from_map(stage->interface_blocks, strct.block_declaration->name, *strct.block_declaration);
+			strct.block_declaration->block_declaration = 0;
+		}
+	}
+}
+
 void NodeRemover::visit(VariableDeclaration &var)
 {
-	if(recursive_remove || to_remove->count(&var))
+	if(to_remove->count(&var))
 	{
 		remove_from_map(current_block->variables, var.name, var);
+		if(var.block_declaration)
+		{
+			remove_from_map(stage->interface_blocks, format("%s %s", var.interface, var.block_declaration->block_name), var);
+			remove_from_map(stage->interface_blocks, var.name, var);
+			var.block_declaration->block_declaration = 0;
+		}
 		stage->locations.erase(var.name);
 		if(var.linked_declaration)
 			var.linked_declaration->linked_declaration = 0;
@@ -189,18 +196,6 @@ void NodeRemover::visit(VariableDeclaration &var)
 		var.init_expression = 0;
 }
 
-void NodeRemover::visit(InterfaceBlock &iface)
-{
-	if(to_remove->count(&iface))
-	{
-		remove_from_map(stage->interface_blocks, format("%s %s", iface.interface, iface.block_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);
-}
-
 void NodeRemover::visit(FunctionDeclaration &func)
 {
 	if(to_remove->count(&func))
@@ -220,11 +215,6 @@ void NodeRemover::visit(Iteration &iter)
 }
 
 
-NodeReorderer::NodeReorderer():
-	reorder_before(0),
-	to_reorder(0)
-{ }
-
 void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 {
 	reorder_before = &before;