Rewrite UnusedVariableRemover

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 26076452efe58776ac092a8ce6ad840f63345b14..5448ea7c4e8771b8008ec0a6b786349f9386cc90 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -184,27 +184,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,14 +221,13 @@ 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);
+       void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(FunctionCall &);
        virtual void visit(ExpressionStatement &);
        // Ignore structs because their members can't be accessed directly.
@@ -227,7 +235,7 @@ private:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
-       void merge_down_variables();
+       void merge_variables(const BlockVariableMap &);
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
 };