X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=8a888e15bec7c11e019b172570e758a06f46963b;hb=0388083;hp=ca22c9d8259fdf198c0c63cc5221361ee010c8a6;hpb=bde40be11da83206f3d33a8225963d47a413662e;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index ca22c9d8..8a888e15 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -43,10 +43,12 @@ private:
 	FunctionDeclaration *source_func;
 	Block *target_block;
 	std::map<std::string, VariableDeclaration *> variable_map;
-	bool remap_names;
+	std::string remap_prefix;
+	unsigned remap_names;
 	bool deps_only;
 	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
+	std::set<std::string> referenced_names;
 	std::string r_result_name;
 
 public:
@@ -55,8 +57,6 @@ public:
 	const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionDeclaration &);
 
 private:
-	std::string create_unused_name(const std::string &, bool);
-
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
@@ -122,7 +122,6 @@ public:
 	bool apply(Stage &);
 
 private:
-	void visit_and_record(RefPtr<Expression> &);
 	void inline_expression(Expression &, RefPtr<Expression> &);
 	virtual void visit(Block &);
 	virtual void visit(RefPtr<Expression> &);