Cosmetic fixes

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index cc030eab7e31f33e71a8cb575f3013c7fdeab0df..3e480484c33dd6e12ad1ac8bad61801ba01b94c4 100644 (file)
--- 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.block_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);