X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=26076452efe58776ac092a8ce6ad840f63345b14;hb=2a9f8f3803e1b57e0e5325454266d4e701b38cc5;hp=4f3bf8cc3646927f12d3f051146b6ca6775c4b3d;hpb=e2357c3e5438706ab6fcda86199cd897d46cfcd3;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 4f3bf8cc..26076452 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -83,21 +83,11 @@ public:
 	bool apply(Stage &);
 
 private:
-	void visit_and_inline(RefPtr<Expression> &);
-
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(Block &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &a) { visit(static_cast<BinaryExpression &>(a)); }
-	virtual void visit(MemberAccess &);
-	virtual void visit(Swizzle &);
 	virtual void visit(FunctionCall &);
-	virtual void visit(ExpressionStatement &);
-	virtual void visit(VariableDeclaration &);
 	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Inlines variables into expressions.  Variables with trivial values (those
@@ -120,7 +110,7 @@ private:
 		ExpressionInfo();
 	};
 
-	std::map<VariableDeclaration *, ExpressionInfo> expressions;
+	std::map<Assignment::Target, ExpressionInfo> expressions;
 	ExpressionInfo *r_ref_info;
 	bool r_any_inlined;
 	bool r_trivial;
@@ -138,6 +128,7 @@ private:
 	void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
 	void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Swizzle &);
@@ -146,9 +137,7 @@ private:
 	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Removes conditional statements and loops where the condition can be