Process existing inputs in passthrough

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 978b01e2d159135d3dcf5dbb7b0ef6b4b5bb6c0d..3b63c5e906bd257bdd568a6d89527e5fd2e01fb1 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -12,8 +12,17 @@ class Program;
 
 class ProgramCompiler
 {
-public:
-       struct Formatter: ProgramSyntax::NodeVisitor
+private:
+       struct Visitor: ProgramSyntax::TraversingVisitor
+       {
+               ProgramSyntax::Stage *stage;
+
+               Visitor();
+
+               virtual void apply(ProgramSyntax::Stage &);
+       };
+
+       struct Formatter: Visitor
        {
                std::string formatted;
                unsigned indent;
@@ -41,8 +50,7 @@ public:
                virtual void visit(ProgramSyntax::Return &);
        };
 
-private:
-       struct VariableResolver: ProgramSyntax::TraversingVisitor
+       struct VariableResolver: Visitor
        {
                std::vector<ProgramSyntax::Block *> blocks;
                ProgramSyntax::StructDeclaration *type;
@@ -59,20 +67,19 @@ private:
                virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
-       struct InterfaceGenerator: ProgramSyntax::TraversingVisitor
+       struct InterfaceGenerator: Visitor
        {
-               ProgramSyntax::Context *context;
                std::string in_prefix;
                std::string out_prefix;
                unsigned scope_level;
-               std::map<std::string, ProgramSyntax::NodePtr<ProgramSyntax::Node> > iface_declarations;
+               std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
                bool remove_node;
-               std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> > insert_nodes;
+               std::list<ProgramSyntax::Node *> insert_nodes;
 
                InterfaceGenerator();
 
-               static std::string get_out_prefix(ProgramSyntax::ContextType);
-               void visit(ProgramSyntax::Context &);
+               static std::string get_out_prefix(ProgramSyntax::StageType);
+               virtual void apply(ProgramSyntax::Stage &);
                virtual void visit(ProgramSyntax::Block &);
                std::string change_prefix(const std::string &, const std::string &) const;
                bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
@@ -82,22 +89,29 @@ private:
                virtual void visit(ProgramSyntax::Passthrough &);
        };
 
-       struct VariableRenamer: ProgramSyntax::TraversingVisitor
+       struct VariableRenamer: Visitor
        {
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
 
-       struct UnusedVariableLocator: ProgramSyntax::TraversingVisitor
+       struct UnusedVariableLocator: Visitor
        {
-               std::set<ProgramSyntax::VariableDeclaration *> unused_variables;
+               std::set<ProgramSyntax::Node *> unused_nodes;
+               std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
+               bool assignment;
+               ProgramSyntax::VariableDeclaration *assignment_target;
+
+               UnusedVariableLocator();
 
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
+               virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::ExpressionStatement &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
 
-       struct NodeRemover: ProgramSyntax::TraversingVisitor
+       struct NodeRemover: Visitor
        {
                std::set<ProgramSyntax::Node *> to_remove;
                unsigned n_removed;
@@ -108,6 +122,7 @@ private:
 
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::StructDeclaration &);
+               virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
@@ -123,10 +138,12 @@ public:
 
 private:
        void process();
-       void process(ProgramSyntax::Context &);
+       void generate(ProgramSyntax::Stage &);
+       void optimize(ProgramSyntax::Stage &);
        static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
-       static void resolve_variables(ProgramSyntax::Context &);
-       std::string format_context(ProgramSyntax::Context &);
+       template<typename T>
+       static void apply(ProgramSyntax::Stage &);
+       std::string create_source(ProgramSyntax::Stage &);
 };
 
 } // namespace GL