Populate the interface block map in VariableResolver

They're more variable-y than block-y.

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index e037e0a5bb09ee7ee26cb1bee9eb62155d41a2c3..751043d9231a64d4c72af4894ec29c39b8143d48 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -78,16 +78,6 @@ void BlockResolver::enter(Block &block)
        block.parent = current_block;
 }
 
-void BlockResolver::visit(InterfaceBlock &iface)
-{
-       /* Block names can't be used for any other identifiers so we can put them
-       in the same map with instance names. */
-       current_block->interfaces[iface.name] = &iface;
-       if(!iface.instance_name.empty())
-               current_block->interfaces[iface.instance_name] = &iface;
-       TraversingVisitor::visit(iface);
-}
-
 
 VariableResolver::VariableResolver():
        builtins(0),
@@ -268,6 +258,12 @@ void VariableResolver::visit(VariableDeclaration &var)
 
 void VariableResolver::visit(InterfaceBlock &iface)
 {
+       /* Block names can't be used for any other identifiers so we can put them
+       in the same map with instance names. */
+       current_block->interfaces[iface.name] = &iface;
+       if(!iface.instance_name.empty())
+               current_block->interfaces[iface.instance_name] = &iface;
+
        SetForScope<string> set_iface(block_interface, iface.interface);
        TraversingVisitor::visit(iface);
 }

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 2a36f704603592ab5c60c035605cb1b6e85a5c47..d0cbc08f279c4b8c12837abf2e0f040b784f6f2b 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -34,7 +34,6 @@ public:
 
 private:
        virtual void enter(Block &);
-       virtual void visit(InterfaceBlock &);
 };
 
 class VariableResolver: private TraversingVisitor