Improve support for interface blocks

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 6740f38ea5c49e531b9fbbabf9b285e08ea7f24b..4968297635c074e975af19e42934c57fe1da78a7 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 &);
 };
 
@@ -41,7 +41,8 @@ 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;
@@ -55,16 +56,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 &);
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -86,6 +86,8 @@ private:
        Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
+       bool function_scope;
+       InterfaceBlock *iface_block;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;
        std::set<Node *> nodes_to_remove;
@@ -103,6 +105,8 @@ private:
        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 &);
 };