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 0c2a0ad8fce4b03aee235202f9a4eaebe0937d59..4968297635c074e975af19e42934c57fe1da78a7 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,31 +11,38 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: private BlockModifier
+class DeclarationCombiner: private TraversingVisitor
 {
 private:
-       bool toplevel;
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
        std::map<std::string, VariableDeclaration *> variables;
+       std::set<Node *> nodes_to_remove;
 
 public:
-       DeclarationCombiner();
-
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &);
 
 private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
-       using BlockModifier::visit;
+};
+
+class BlockResolver: private TraversingVisitor
+{
+public:
+       void apply(Stage &s) { s.content.visit(*this); }
+
+private:
+       virtual void enter(Block &);
+       virtual void visit(InterfaceBlock &);
 };
 
 class VariableResolver: private TraversingVisitor
 {
 private:
-       std::vector<Block *> blocks;
-       StructDeclaration *type;
-       bool anonymous;
+       Block *builtins;
+       std::map<std::string, VariableDeclaration *> *members;
+       RefPtr<InterfaceBlockReference> iface_ref;
        std::string block_interface;
        bool record_target;
        VariableDeclaration *assignment_target;
@@ -47,15 +54,17 @@ public:
        void apply(Stage &);
 
 private:
-       virtual void visit(Block &);
+       Block *next_block(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 &);
-       using TraversingVisitor::visit;
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -64,22 +73,24 @@ 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 BlockModifier
+class InterfaceGenerator: private TraversingVisitor
 {
 private:
        Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
-       unsigned scope_level;
-       std::map<std::string, RefPtr<VariableDeclaration> > iface_declarations;
+       bool function_scope;
+       InterfaceBlock *iface_block;
+       NodeList<Statement>::iterator iface_insert_point;
+       NodeList<Statement>::iterator assignment_insert_point;
+       std::set<Node *> nodes_to_remove;
 
 public:
        InterfaceGenerator();
@@ -94,8 +105,9 @@ 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 &);
-       using BlockModifier::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -110,7 +122,6 @@ private:
                FUNCTION
        };
 
-       unsigned scope_level;
        DeclarationKind kind;
        std::set<Node *> ordered_funcs;
        std::set<Node *> needed_funcs;
@@ -118,7 +129,7 @@ private:
 public:
        DeclarationReorderer();
 
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
        virtual void visit(Block &);
@@ -128,7 +139,6 @@ private:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL