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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 2d1b20c9..2caa498d 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -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,7 +73,7 @@ private:
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	using BlockModifier::visit;
+	using TraversingVisitor::visit;
 };
 
 class UnusedVariableRemover: private TraversingVisitor
@@ -97,7 +98,6 @@ private:
 	Assignment *assignment;
 	bool assignment_target;
 	bool assign_to_subscript;
-	bool global_scope;
 
 public:
 	UnusedVariableRemover();