Refactor UnusedVariableRemover

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 67d064c5328574bafe6f5bffdba2b1be081d9a94..4f3bf8cc3646927f12d3f051146b6ca6775c4b3d 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -197,23 +197,24 @@ class UnusedVariableRemover: private TraversingVisitor
 private:
        struct VariableInfo
        {
-               bool local;
                std::vector<Node *> assignments;
+               bool local;
+               bool output;
                bool conditionally_assigned;
                bool referenced;
+               InterfaceBlock *interface_block;
 
                VariableInfo();
        };
 
-       typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+       typedef std::map<Assignment::Target, VariableInfo> BlockVariableMap;
 
+       Stage *stage;
        std::set<Node *> unused_nodes;
-       std::map<VariableDeclaration *, Node *> aggregates;
-       Node *aggregate;
        std::vector<BlockVariableMap> variables;
+       InterfaceBlock *interface_block;
        Assignment *r_assignment;
        bool assignment_target;
-       bool r_assign_to_subfield;
        bool r_side_effects;
 
 public:
@@ -222,18 +223,18 @@ public:
        bool apply(Stage &);
 
 private:
+       void reference_used(Statement &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
-       virtual void visit(MemberAccess &);
-       virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
-       void record_assignment(VariableDeclaration &, Node &, bool);
+       void record_assignment(const Assignment::Target &, Node &, bool);
        void clear_assignments(VariableInfo &, bool);
        virtual void visit(FunctionCall &);
        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 &);
        virtual void visit(FunctionDeclaration &);