X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=2d1b20c99e72d7b1361508cc9bdda14c2424952b;hb=ff8a0248f1a3c0c1f48f670867bc9106c898c55b;hp=cfebf0f782c46aee0c2bbc0730baf555b0081b8a;hpb=0ca367ce305ae6f2025739b3b199a7f75d4132db;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index cfebf0f7..2d1b20c9 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -37,9 +37,8 @@ private:
 
 public:
 	FunctionInliner();
-	FunctionInliner(const std::set<FunctionDeclaration *> &);
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
 private:
 	void visit_and_inline(RefPtr<Expression> &);
@@ -76,7 +75,7 @@ private:
 	using BlockModifier::visit;
 };
 
-class UnusedVariableLocator: private TraversingVisitor
+class UnusedVariableRemover: private TraversingVisitor
 {
 private:
 	struct VariableInfo
@@ -101,9 +100,9 @@ private:
 	bool global_scope;
 
 public:
-	UnusedVariableLocator();
+	UnusedVariableRemover();
 
-	const std::set<Node *> &apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	virtual void visit(VariableReference &);
@@ -123,14 +122,14 @@ private:
 	using TraversingVisitor::visit;
 };
 
-class UnusedFunctionLocator: private TraversingVisitor
+class UnusedFunctionRemover: private TraversingVisitor
 {
 private:
 	std::set<Node *> unused_nodes;
 	std::set<FunctionDeclaration *> used_definitions;
 
 public:
-	const std::set<Node *> &apply(Stage &s) { visit(s.content); return unused_nodes; }
+	bool apply(Stage &s);
 
 private:
 	virtual void visit(FunctionCall &);