Populate the interface block map in VariableResolver

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 511a460793d4e162fb05c24119c37c8538114322..d0cbc08f279c4b8c12837abf2e0f040b784f6f2b 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -25,25 +25,23 @@ private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class BlockResolver: private TraversingVisitor
 {
 public:
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
-       virtual void visit(Block &);
-       virtual void visit(InterfaceBlock &);
-       using TraversingVisitor::visit;
+       virtual void enter(Block &);
 };
 
 class VariableResolver: private TraversingVisitor
 {
 private:
        Block *builtins;
-       StructDeclaration *type;
+       std::map<std::string, VariableDeclaration *> *members;
+       RefPtr<InterfaceBlockReference> iface_ref;
        std::string block_interface;
        bool record_target;
        VariableDeclaration *assignment_target;
@@ -57,17 +55,15 @@ public:
 private:
        Block *next_block(Block &);
 
-       virtual void visit(Block &);
+       virtual void enter(Block &);
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
-       virtual void visit(FunctionDeclaration &);
-       virtual void visit(Iteration &);
-       using TraversingVisitor::visit;
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -76,12 +72,11 @@ private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class InterfaceGenerator: private TraversingVisitor
@@ -90,6 +85,10 @@ private:
        Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
+       bool function_scope;
+       InterfaceBlock *iface_block;
+       bool copy_block;
+       Block *iface_target_block;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;
        std::set<Node *> nodes_to_remove;
@@ -104,11 +103,13 @@ private:
        std::string change_prefix(const std::string &, const std::string &) const;
        virtual void visit(Block &);
        bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+       bool generate_interface(InterfaceBlock &);
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &);
        virtual void visit(Passthrough &);
-       using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -130,7 +131,7 @@ private:
 public:
        DeclarationReorderer();
 
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
        virtual void visit(Block &);
@@ -140,7 +141,6 @@ private:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL