Move unique name generation to syntax.cpp

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 26076452efe58776ac092a8ce6ad840f63345b14..ab954b58a471431feab1d6da0f75e9a2abe3bbaa 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -55,8 +55,6 @@ public:
        const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionDeclaration &);
 
 private:
-       std::string create_unused_name(const std::string &, bool);
-
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(FunctionCall &);
@@ -101,9 +99,6 @@ private:
                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;
 
@@ -125,8 +120,7 @@ public:
        bool apply(Stage &);
 
 private:
-       void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
-       void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
+       void inline_expression(Expression &, RefPtr<Expression> &);
        virtual void visit(Block &);
        virtual void visit(RefPtr<Expression> &);
        virtual void visit(VariableReference &);
@@ -135,6 +129,7 @@ private:
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(Iteration &);
@@ -170,6 +165,7 @@ private:
        virtual void visit(Literal &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(ImageTypeDeclaration &);
@@ -184,27 +180,36 @@ 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
        {
-               std::vector<Node *> assignments;
-               bool local;
+               InterfaceBlock *interface_block;
+               std::vector<AssignmentInfo *> assignments;
+               bool initialized;
                bool output;
-               bool conditionally_assigned;
                bool referenced;
-               InterfaceBlock *interface_block;
 
-               VariableInfo();
+               VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
        };
 
-       typedef std::map<Assignment::Target, VariableInfo> BlockVariableMap;
+       typedef std::map<Statement *, VariableInfo> BlockVariableMap;
 
        Stage *stage;
-       std::set<Node *> unused_nodes;
-       std::vector<BlockVariableMap> variables;
+       BlockVariableMap variables;
+       std::list<AssignmentInfo> assignments;
        InterfaceBlock *interface_block;
        Assignment *r_assignment;
        bool assignment_target;
        bool r_side_effects;
+       std::set<Node *> unused_nodes;
 
 public:
        UnusedVariableRemover();
@@ -212,22 +217,21 @@ public:
        bool apply(Stage &);
 
 private:
-       void reference_used(Statement &);
+       void referenced(const Assignment::Target &, Node &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
-       void record_assignment(const Assignment::Target &, Node &, bool);
-       void clear_assignments(VariableInfo &, bool);
        virtual void visit(FunctionCall &);
+       void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(ExpressionStatement &);
        // 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 &);
 };