Track composite assignments and references in UnusedVariableRemover

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 4113f21465a990e85a4fa701351b8277cec09cfe..249a859a03763c6e198b9c0f04020dc0589ea360 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -237,11 +237,7 @@ public:
        bool apply(Stage &);
 
 private:
-       virtual void visit(Literal &);
-       virtual void visit(UnaryExpression &);
-       virtual void visit(BinaryExpression &);
-       virtual void visit(TernaryExpression &);
-       virtual void visit(FunctionCall &);
+       virtual void visit(RefPtr<Expression> &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
@@ -284,6 +280,8 @@ private:
        Assignment *r_assignment;
        bool assignment_target;
        bool r_side_effects;
+       bool composite_reference;
+       Assignment::Target r_reference;
        std::set<Node *> unused_nodes;
 
 public:
@@ -295,9 +293,13 @@ private:
        void referenced(const Assignment::Target &, Node &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
+       void visit_composite(Expression &);
+       virtual void visit(MemberAccess &);
+       virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(ExpressionStatement &);