X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=3e480484c33dd6e12ad1ac8bad61801ba01b94c4;hb=7302c50728ea317bcabe2d243af6b9142aac4ccd;hp=fd9e9792b303cac8060d5b7b14b6f2fd74576b36;hpb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index fd9e9792..3e480484 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -88,6 +88,8 @@ void TraversingVisitor::visit(VariableDeclaration &var)
 
 void TraversingVisitor::visit(InterfaceBlock &iface)
 {
+	if(iface.layout)
+		iface.layout->visit(*this);
 	if(iface.members)
 		iface.members->visit(*this);
 }
@@ -191,9 +193,9 @@ void NodeRemover::visit(InterfaceBlock &iface)
 {
 	if(to_remove->count(&iface))
 	{
-		remove_from_map(stage->interface_blocks, iface.interface+iface.name, 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);
+			remove_from_map(stage->interface_blocks, iface.instance_name, iface);
 	}
 	SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
 	TraversingVisitor::visit(iface);