Add expression inlining

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 28f5e87688629634f9e05734e61cdbc1c5995ad1..c932767e99807325f159372e626895aafa213c5b 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -98,26 +98,69 @@ private:
        virtual void visit(Return &);
 };
 
+/** Inlines variables into expressions.  Variables with trivial values (those
+consisting of a single literal or variable reference) are always inlined.
+Variables which are only referenced once are also inlined. */
+class ExpressionInliner: private TraversingVisitor
+{
+private:
+       struct ExpressionInfo
+       {
+               Expression *expression;
+               Block *assign_scope;
+               RefPtr<Expression> *inline_point;
+               const Operator *inner_oper;
+               const Operator *outer_oper;
+               bool inline_on_rhs;
+               bool trivial;
+               bool available;
+
+               ExpressionInfo();
+       };
+
+       std::map<VariableDeclaration *, ExpressionInfo> expressions;
+       ExpressionInfo *r_ref_info;
+       bool r_any_inlined;
+       bool r_trivial;
+       bool mutating;
+       bool iteration_init;
+       Block *iteration_body;
+       const Operator *r_oper;
+
+public:
+       ExpressionInliner();
+
+       bool apply(Stage &);
+
+private:
+       void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
+       void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
+       virtual void visit(Block &);
+       virtual void visit(VariableReference &);
+       virtual void visit(MemberAccess &);
+       virtual void visit(UnaryExpression &);
+       virtual void visit(BinaryExpression &);
+       virtual void visit(Assignment &);
+       virtual void visit(FunctionCall &);
+       virtual void visit(VariableDeclaration &);
+       virtual void visit(Conditional &);
+       virtual void visit(Iteration &);
+       virtual void visit(Return &);
+};
+
 /** Removes conditional statements and loops where the condition can be
 determined as constant at compile time. */
 class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
-       bool record_only;
-       ExpressionEvaluator::ValueMap variable_values;
        NodeList<Statement>::iterator insert_point;
        std::set<Node *> nodes_to_remove;
 
 public:
-       ConstantConditionEliminator();
-
        void apply(Stage &);
 
 private:
        virtual void visit(Block &);
-       virtual void visit(UnaryExpression &);
-       virtual void visit(Assignment &);
-       virtual void visit(VariableDeclaration &);
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
 };