Only generate or link interfaces in the correct scope

[libs/gl.git] / source / glsl / generate.h

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 6740f38ea5c49e531b9fbbabf9b285e08ea7f24b..72035b2c4869504199edda4df59e46958b41fed1 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -33,7 +33,7 @@ public:
        void apply(Stage &s) { s.content.visit(*this); }
 
 private:
-       virtual void visit(Block &);
+       virtual void enter(Block &);
        virtual void visit(InterfaceBlock &);
 };
 
@@ -55,7 +55,7 @@ public:
 private:
        Block *next_block(Block &);
 
-       virtual void visit(Block &);
+       virtual void enter(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
@@ -63,8 +63,6 @@ private:
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
-       virtual void visit(FunctionDeclaration &);
-       virtual void visit(Iteration &);
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -86,6 +84,7 @@ private:
        Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
+       bool function_scope;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;
        std::set<Node *> nodes_to_remove;
@@ -103,6 +102,7 @@ private:
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(FunctionDeclaration &);
        virtual void visit(Passthrough &);
 };