Add a module for builtin interface variables

[libs/gl.git] / source / programcompiler.h

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 3b63c5e906bd257bdd568a6d89527e5fd2e01fb1..695c2e260a7c65ec4ced67b5c9b15c7c537c5d16 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -28,6 +28,7 @@ private:
                unsigned indent;
                bool parameter_list;
                bool else_if;
+               std::string block_interface;
 
                Formatter();
 
@@ -55,9 +56,11 @@ private:
                std::vector<ProgramSyntax::Block *> blocks;
                ProgramSyntax::StructDeclaration *type;
                bool anonymous;
+               std::string block_interface;
 
                VariableResolver();
 
+               virtual void apply(ProgramSyntax::Stage &);
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
@@ -98,9 +101,14 @@ private:
        struct UnusedVariableLocator: Visitor
        {
                std::set<ProgramSyntax::Node *> unused_nodes;
+               std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
+               ProgramSyntax::Node *aggregate;
                std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
                bool assignment;
+               bool record_target;
                ProgramSyntax::VariableDeclaration *assignment_target;
+               bool indeterminate_target;
+               bool self_referencing;
 
                UnusedVariableLocator();
 
@@ -108,22 +116,17 @@ private:
                virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
                virtual void visit(ProgramSyntax::ExpressionStatement &);
+               virtual void visit(ProgramSyntax::StructDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
+               virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
        struct NodeRemover: Visitor
        {
                std::set<ProgramSyntax::Node *> to_remove;
-               unsigned n_removed;
-               bool immutable_block;
-               bool remove_block;
-
-               NodeRemover();
 
                virtual void visit(ProgramSyntax::Block &);
-               virtual void visit(ProgramSyntax::StructDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
-               virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
        ProgramParser parser;
@@ -137,9 +140,12 @@ public:
        void add_shaders(Program &);
 
 private:
+       static ProgramSyntax::Module *create_builtins_module();
+       static ProgramSyntax::Module &get_builtins_module();
+       static ProgramSyntax::Stage *get_builtins(ProgramSyntax::StageType);
        void process();
        void generate(ProgramSyntax::Stage &);
-       void optimize(ProgramSyntax::Stage &);
+       bool optimize(ProgramSyntax::Stage &);
        static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
        template<typename T>
        static void apply(ProgramSyntax::Stage &);