Further refactor block and scope management

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 1867cc3e2a7d1a909ec3f59368216f6d69e17d23..511a460793d4e162fb05c24119c37c8538114322 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -14,14 +14,11 @@ namespace SL {
 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 &);
 
 private:
@@ -31,12 +28,22 @@ private:
        using TraversingVisitor::visit;
 };
 
+class BlockResolver: private TraversingVisitor
+{
+public:
+       void apply(Stage &s) { visit(s.content); }
+
+private:
+       virtual void visit(Block &);
+       virtual void visit(InterfaceBlock &);
+       using TraversingVisitor::visit;
+};
+
 class VariableResolver: private TraversingVisitor
 {
 private:
-       std::vector<Block *> blocks;
+       Block *builtins;
        StructDeclaration *type;
-       bool anonymous;
        std::string block_interface;
        bool record_target;
        VariableDeclaration *assignment_target;
@@ -48,6 +55,8 @@ public:
        void apply(Stage &);
 
 private:
+       Block *next_block(Block &);
+
        virtual void visit(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
@@ -81,8 +90,6 @@ private:
        Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
-       unsigned scope_level;
-       Block *current_block;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;
        std::set<Node *> nodes_to_remove;
@@ -116,7 +123,6 @@ private:
                FUNCTION
        };
 
-       unsigned scope_level;
        DeclarationKind kind;
        std::set<Node *> ordered_funcs;
        std::set<Node *> needed_funcs;