X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=01508f450257ac4bee4b00dffd4e062449f3e8a5;hb=48700161395ece1c8132ee687bf94cd62c6ec2df;hp=2e28d48a0dcbfe711057572cc7f5e1574dbe8789;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h index 2e28d48a..01508f45 100644 --- a/source/glsl/optimize.h +++ b/source/glsl/optimize.h @@ -10,7 +10,7 @@ namespace Msp { namespace GL { namespace SL { -class InlineableFunctionLocator: public TraversingVisitor +class InlineableFunctionLocator: private TraversingVisitor { private: std::map refcounts; @@ -22,12 +22,13 @@ public: const std::set &apply(Stage &s) { visit(s.content); return inlineable; } - using TraversingVisitor::visit; +private: virtual void visit(FunctionCall &); virtual void visit(FunctionDeclaration &); + using TraversingVisitor::visit; }; -class FunctionInliner: public TraversingVisitor +class FunctionInliner: private TraversingVisitor { private: std::set inlineable; @@ -35,15 +36,13 @@ private: RefPtr inline_result; public: - FunctionInliner(); FunctionInliner(const std::set &); void apply(Stage &s) { visit(s.content); } private: void visit_and_inline(RefPtr &); -public: - using TraversingVisitor::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; @@ -65,16 +65,17 @@ public: void apply(Stage &s) { visit(s.content); } - using BlockModifier::visit; +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 TraversingVisitor +class UnusedVariableLocator: private TraversingVisitor { private: struct VariableInfo @@ -103,28 +104,25 @@ public: const std::set &apply(Stage &); - using TraversingVisitor::visit; +private: virtual void visit(VariableReference &); virtual void visit(MemberAccess &); virtual void visit(BinaryExpression &); virtual void visit(Assignment &); -private: void record_assignment(VariableDeclaration &, Node &, bool); void clear_assignments(VariableInfo &, bool); -public: virtual void visit(ExpressionStatement &); virtual void visit(StructDeclaration &); virtual void visit(VariableDeclaration &); virtual void visit(InterfaceBlock &); virtual void visit(FunctionDeclaration &); -private: void merge_down_variables(); -public: virtual void visit(Conditional &); virtual void visit(Iteration &); + using TraversingVisitor::visit; }; -class UnusedFunctionLocator: public TraversingVisitor +class UnusedFunctionLocator: private TraversingVisitor { private: std::set unused_nodes; @@ -133,9 +131,10 @@ private: public: const std::set &apply(Stage &s) { visit(s.content); return unused_nodes; } - using TraversingVisitor::visit; +private: virtual void visit(FunctionCall &); virtual void visit(FunctionDeclaration &); + using TraversingVisitor::visit; }; } // namespace SL