Some rearranging and comments

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index e74e6e0e812b3a3cdaf2f1b5286960fdc87487b2..34c0b2455bd4e4ac60126b72e53586a016d16425 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -45,9 +45,9 @@ private:
        std::map<std::string, VariableDeclaration *> variable_map;
        bool remap_names;
        bool deps_only;
-       RefPtr<Statement> inlined_statement;
+       RefPtr<Statement> r_inlined_statement;
        std::set<Node *> dependencies;
-       std::string result_name;
+       std::string r_result_name;
 
 public:
        InlineContentInjector();
@@ -74,8 +74,8 @@ private:
        std::set<FunctionDeclaration *> inlineable;
        FunctionDeclaration *current_function;
        NodeList<Statement>::iterator insert_point;
-       RefPtr<Expression> inline_result;
-       bool any_inlined;
+       RefPtr<Expression> r_inline_result;
+       bool r_any_inlined;
 
 public:
        FunctionInliner();
@@ -83,19 +83,61 @@ public:
        bool apply(Stage &);
 
 private:
-       void visit_and_inline(RefPtr<Expression> &);
+       virtual void visit(RefPtr<Expression> &);
+       virtual void visit(Block &);
+       virtual void visit(FunctionCall &);
+       virtual void visit(FunctionDeclaration &);
+       virtual void visit(Iteration &);
+};
+
+/** 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<Assignment::Target, 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(RefPtr<Expression> &);
+       virtual void visit(VariableReference &);
+       virtual void visit(MemberAccess &);
+       virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
-       virtual void visit(MemberAccess &);
+       virtual void visit(Assignment &);
        virtual void visit(FunctionCall &);
-       virtual void visit(ExpressionStatement &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(FunctionDeclaration &);
-       virtual void visit(Conditional &);
        virtual void visit(Iteration &);
-       virtual void visit(Return &);
 };
 
 /** Removes conditional statements and loops where the condition can be
@@ -103,50 +145,75 @@ 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 &);
 };
 
+/** Removes types which are not used anywhere. */
+class UnusedTypeRemover: private TraversingVisitor
+{
+private:
+       std::set<Node *> unused_nodes;
+
+public:
+       bool apply(Stage &);
+
+private:
+       virtual void visit(Literal &);
+       virtual void visit(UnaryExpression &);
+       virtual void visit(BinaryExpression &);
+       virtual void visit(FunctionCall &);
+       virtual void visit(BasicTypeDeclaration &);
+       virtual void visit(ImageTypeDeclaration &);
+       virtual void visit(StructDeclaration &);
+       virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &);
+};
+
 /** Removes variable declarations with no references to them.  Assignment
 statements where the result is not used are also removed. */
 class UnusedVariableRemover: private TraversingVisitor
 {
 private:
+       struct AssignmentInfo
+       {
+               Node *node;
+               Assignment::Target target;
+               std::vector<Node *> used_by;
+
+               AssignmentInfo(): node(0) { }
+       };
+
        struct VariableInfo
        {
-               bool local;
-               std::vector<Node *> assignments;
-               bool conditionally_assigned;
+               InterfaceBlock *interface_block;
+               std::vector<AssignmentInfo *> assignments;
+               bool initialized;
+               bool output;
                bool referenced;
 
-               VariableInfo();
+               VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
        };
 
-       typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+       typedef std::map<Statement *, VariableInfo> BlockVariableMap;
 
-       std::set<Node *> unused_nodes;
-       std::map<VariableDeclaration *, Node *> aggregates;
-       Node *aggregate;
-       std::vector<BlockVariableMap> variables;
-       Assignment *assignment;
+       Stage *stage;
+       BlockVariableMap variables;
+       std::list<AssignmentInfo> assignments;
+       InterfaceBlock *interface_block;
+       Assignment *r_assignment;
        bool assignment_target;
-       bool assign_to_subscript;
-       bool side_effects;
+       bool r_side_effects;
+       std::set<Node *> unused_nodes;
 
 public:
        UnusedVariableRemover();
@@ -154,21 +221,21 @@ public:
        bool apply(Stage &);
 
 private:
+       void referenced(const Assignment::Target &, Node &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
-       virtual void visit(MemberAccess &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
-       void record_assignment(VariableDeclaration &, Node &, bool);
-       void clear_assignments(VariableInfo &, bool);
        virtual void visit(FunctionCall &);
+       void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(ExpressionStatement &);
-       virtual void visit(StructDeclaration &);
+       // Ignore structs because their members can't be accessed directly.
+       virtual void visit(StructDeclaration &) { }
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
+       void merge_variables(const BlockVariableMap &);
        virtual void visit(FunctionDeclaration &);
-       void merge_down_variables();
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
 };