Rearrange secondary operations in GLSL compiler

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 698aa0b2617efd3ef1f6a98348aa754b19f04862..2d1b20c99e72d7b1361508cc9bdda14c2424952b 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -10,11 +10,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class InlineableFunctionLocator: public StageVisitor
+class InlineableFunctionLocator: private TraversingVisitor
 {
-public:
-       typedef std::set<FunctionDeclaration *> ResultType;
-
 private:
        std::map<FunctionDeclaration *, unsigned> refcounts;
        std::set<FunctionDeclaration *> inlineable;
@@ -23,13 +20,15 @@ private:
 public:
        InlineableFunctionLocator();
 
-       const ResultType &get_result() const { return inlineable; }
-       using StageVisitor::visit;
+       const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+
+private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
-class FunctionInliner: public StageVisitor
+class FunctionInliner: private TraversingVisitor
 {
 private:
        std::set<FunctionDeclaration *> inlineable;
@@ -38,12 +37,12 @@ private:
 
 public:
        FunctionInliner();
-       FunctionInliner(const std::set<FunctionDeclaration *> &);
+
+       void apply(Stage &);
 
 private:
        void visit_and_inline(RefPtr<Expression> &);
-public:
-       using StageVisitor::visit;
+
        virtual void visit(Block &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
@@ -51,9 +50,10 @@ public:
        virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(Return &);
+       using TraversingVisitor::visit;
 };
 
-class ConstantConditionEliminator: public BlockModifier
+class ConstantConditionEliminator: private BlockModifier
 {
 private:
        unsigned scope_level;
@@ -63,20 +63,20 @@ private:
 public:
        ConstantConditionEliminator();
 
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+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 &);
+       using BlockModifier::visit;
 };
 
-class UnusedVariableLocator: public StageVisitor
+class UnusedVariableRemover: private TraversingVisitor
 {
-public:
-       typedef std::set<Node *> ResultType;
-
 private:
        struct VariableInfo
        {
@@ -100,12 +100,11 @@ private:
        bool global_scope;
 
 public:
-       UnusedVariableLocator();
+       UnusedVariableRemover();
+
+       bool apply(Stage &);
 
-       virtual void apply(Stage &);
-       const ResultType &get_result() const { return unused_nodes; }
 private:
-       using StageVisitor::visit;
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
@@ -120,22 +119,22 @@ private:
        void merge_down_variables();
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
+       using TraversingVisitor::visit;
 };
 
-class UnusedFunctionLocator: public StageVisitor
+class UnusedFunctionRemover: private TraversingVisitor
 {
-public:
-       typedef std::set<Node *> ResultType;
-
 private:
        std::set<Node *> unused_nodes;
        std::set<FunctionDeclaration *> used_definitions;
 
 public:
-       const ResultType &get_result() const { return unused_nodes; }
-       using StageVisitor::visit;
+       bool apply(Stage &s);
+
+private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
 } // namespace SL