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 72035b2c4869504199edda4df59e46958b41fed1..4968297635c074e975af19e42934c57fe1da78a7 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -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;
@@ -57,6 +58,7 @@ private:
 
        virtual void enter(Block &);
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
@@ -85,6 +87,7 @@ private:
        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;
@@ -102,6 +105,7 @@ 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 &);
 };