Redesign ExpressionInliner

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 6d8a6194e7e9f5d2076fa81938a75aff421e39c2..6250130fb30a39bfd9b18c82cdc9acf654c347ad 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -116,22 +116,32 @@ Variables which are only referenced once are also inlined. */
 class ExpressionInliner: private TraversingVisitor
 {
 private:
+       struct ExpressionUse
+       {
+               RefPtr<Expression> *reference;
+               Block *ref_scope;
+               bool blocked;
+
+               ExpressionUse(): reference(0), ref_scope(0), blocked(false) { }
+       };
+
        struct ExpressionInfo
        {
-               Expression *expression;
+               Assignment::Target target;
+               RefPtr<Expression> expression;
                Block *assign_scope;
-               RefPtr<Expression> *inline_point;
+               std::vector<ExpressionUse> uses;
                bool trivial;
-               bool available;
 
-               ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
+               ExpressionInfo(): expression(0), assign_scope(0), trivial(false) { }
        };
 
-       std::map<Assignment::Target, ExpressionInfo> expressions;
+       std::list<ExpressionInfo> expressions;
+       std::map<Assignment::Target, ExpressionInfo *> assignments;
        ExpressionInfo *r_ref_info;
-       bool r_any_inlined;
        bool r_trivial;
-       bool mutating;
+       bool access_read;
+       bool access_write;
        bool iteration_init;
        Block *iteration_body;
        const Operator *r_oper;
@@ -142,8 +152,6 @@ public:
        bool apply(Stage &);
 
 private:
-       void inline_expression(Expression &, RefPtr<Expression> &);
-       virtual void visit(Block &);
        virtual void visit(RefPtr<Expression> &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);