X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=2caa498da0512624a31734232dfca88e870f6b31;hb=99719790df8a1215465a68c7b1d87a495bff87eb;hp=01508f450257ac4bee4b00dffd4e062449f3e8a5;hpb=48700161395ece1c8132ee687bf94cd62c6ec2df;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 01508f45..2caa498d 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -36,9 +36,9 @@ private:
 	RefPtr<Expression> inline_result;
 
 public:
-	FunctionInliner(const std::set<FunctionDeclaration *> &);
+	FunctionInliner();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
 private:
 	void visit_and_inline(RefPtr<Expression> &);
@@ -53,17 +53,18 @@ private:
 	using TraversingVisitor::visit;
 };
 
-class ConstantConditionEliminator: private BlockModifier
+class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
-	unsigned scope_level;
 	bool record_only;
 	ExpressionEvaluator::ValueMap variable_values;
+	NodeList<Statement>::iterator insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	ConstantConditionEliminator();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
 private:
 	virtual void visit(Block &);
@@ -72,10 +73,10 @@ private:
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	using BlockModifier::visit;
+	using TraversingVisitor::visit;
 };
 
-class UnusedVariableLocator: private TraversingVisitor
+class UnusedVariableRemover: private TraversingVisitor
 {
 private:
 	struct VariableInfo
@@ -97,12 +98,11 @@ private:
 	Assignment *assignment;
 	bool assignment_target;
 	bool assign_to_subscript;
-	bool global_scope;
 
 public:
-	UnusedVariableLocator();
+	UnusedVariableRemover();
 
-	const std::set<Node *> &apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	virtual void visit(VariableReference &);
@@ -122,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 &);