Immediate update camera aspect in View::set_camera

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 2a31a962b989a5cec0021e82584f75a7036ccac4..e43b3a2d45c0e1c272976de51abd6c643cff0054 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -60,6 +60,7 @@ private:
                virtual void visit(ProgramSyntax::Conditional &);
                virtual void visit(ProgramSyntax::Iteration &);
                virtual void visit(ProgramSyntax::Return &);
+               virtual void visit(ProgramSyntax::Jump &);
        };
 
        template<typename T>
@@ -121,12 +122,12 @@ private:
        struct BlockModifier: Visitor
        {
                bool remove_node;
-               std::list<ProgramSyntax::Node *> insert_nodes;
+               std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
 
                BlockModifier();
 
                void flatten_block(ProgramSyntax::Block &);
-               void apply_and_increment(ProgramSyntax::Block &, std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> >::iterator &);
+               void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
                virtual void visit(ProgramSyntax::Block &);
        };
 
@@ -135,7 +136,7 @@ private:
                std::string in_prefix;
                std::string out_prefix;
                unsigned scope_level;
-               std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
+               std::map<std::string, RefPtr<ProgramSyntax::VariableDeclaration> > iface_declarations;
 
                InterfaceGenerator();
 
@@ -156,6 +157,61 @@ private:
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
 
+       struct DeclarationReorderer: Visitor
+       {
+               enum DeclarationKind
+               {
+                       NO_DECLARATION,
+                       LAYOUT,
+                       STRUCT,
+                       VARIABLE,
+                       FUNCTION
+               };
+
+               DeclarationKind kind;
+
+               DeclarationReorderer();
+
+               virtual void visit(ProgramSyntax::Block &);
+               virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
+               virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
+               virtual void visit(ProgramSyntax::VariableDeclaration &) { kind = VARIABLE; }
+               virtual void visit(ProgramSyntax::InterfaceBlock &) { kind = VARIABLE; }
+               virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+       };
+
+       struct InlineableFunctionLocator: Visitor
+       {
+               typedef std::set<ProgramSyntax::FunctionDeclaration *> ResultType;
+
+               std::map<ProgramSyntax::FunctionDeclaration *, unsigned> refcounts;
+               std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+               ProgramSyntax::FunctionDeclaration *in_function;
+
+               InlineableFunctionLocator();
+
+               const ResultType &get_result() const { return inlineable; }
+               virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::FunctionDeclaration &);
+       };
+
+       struct FunctionInliner: Visitor
+       {
+               std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+               unsigned extract_result;
+               RefPtr<ProgramSyntax::Expression> inline_result;
+
+               FunctionInliner();
+               FunctionInliner(const std::set<ProgramSyntax::FunctionDeclaration *> &);
+
+               void visit_and_inline(RefPtr<ProgramSyntax::Expression> &);
+               virtual void visit(ProgramSyntax::Block &);
+               virtual void visit(ProgramSyntax::UnaryExpression &);
+               virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::Return &);
+       };
+
        struct ExpressionEvaluator: ProgramSyntax::NodeVisitor
        {
                typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
@@ -168,6 +224,7 @@ private:
                ExpressionEvaluator(const ValueMap &);
 
                virtual void visit(ProgramSyntax::Literal &);
+               virtual void visit(ProgramSyntax::ParenthesizedExpression &);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::BinaryExpression &);