X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=4113f21465a990e85a4fa701351b8277cec09cfe;hb=2280a09a286bbff2eb41783f8023863f320a3736;hp=4c57eaea94844192b29d3a12c9862d754af6dc2c;hpb=d9d7ab44d5f88c4537906e77c49db06d6bdc099c;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 4c57eaea..4113f214 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -39,7 +39,7 @@ private:
 public:
 	InlineableFunctionLocator();
 
-	const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
+	std::set<FunctionDeclaration *> apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
 	virtual void visit(FunctionCall &);
@@ -57,7 +57,6 @@ class InlineContentInjector: private TraversingVisitor
 private:
 	enum Pass
 	{
-		DEPENDS,
 		REFERENCED,
 		INLINE,
 		RENAME
@@ -74,7 +73,7 @@ private:
 public:
 	InlineContentInjector();
 
-	const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionCall &);
+	std::string apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionCall &);
 
 private:
 	virtual void visit(VariableReference &);
@@ -125,7 +124,7 @@ private:
 		bool trivial;
 		bool available;
 
-		ExpressionInfo();
+		ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
 	};
 
 	std::map<Assignment::Target, ExpressionInfo> expressions;