X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;fp=source%2Fglsl%2Foptimize.cpp;h=d57002552540c6c375cb7446f8465a9538a0a42d;hp=7d605f1f12bc755812a3252172828a84d3720777;hb=22d5405729048ee2677a1e45e309e6328de64a26;hpb=6142f469eb17c06a432fde663c36a0567985d986

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 7d605f1f..d5700255 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -91,7 +91,6 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 	pass = INLINE;
 	staging_block.parent = &tgt_blk;
 	staging_block.variables.clear();
-	remap_prefix = source_func->name;
 
 	std::vector<RefPtr<VariableDeclaration> > params;
 	params.reserve(source_func->parameters.size());
@@ -133,7 +132,6 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 	global identifiers used by the source function. */
 	pass = RENAME;
 	staging_block.parent = source_func->body.parent;
-	remap_prefix = target_func.name;
 	target_func.visit(*this);
 
 	// Put the argument expressions in place after all renaming has been done.
@@ -193,7 +191,7 @@ void InlineContentInjector::visit(VariableDeclaration &var)
 		staging_block.variables[var.name] = &var;
 		if(referenced_names.count(var.name))
 		{
-			string mapped_name = get_unused_variable_name(staging_block, var.name, remap_prefix);
+			string mapped_name = get_unused_variable_name(staging_block, var.name);
 			if(mapped_name!=var.name)
 			{
 				staging_block.variables[mapped_name] = &var;
@@ -217,7 +215,7 @@ void InlineContentInjector::visit(Return &ret)
 	if(pass==INLINE && ret.expression)
 	{
 		// Create a new variable to hold the return value of the inlined function.
-		r_result_name = get_unused_variable_name(staging_block, "_return", source_func->name);
+		r_result_name = get_unused_variable_name(staging_block, "_return");
 		RefPtr<VariableDeclaration> var = new VariableDeclaration;
 		var->source = ret.source;
 		var->line = ret.line;
@@ -285,7 +283,7 @@ void FunctionInliner::visit(FunctionCall &call)
 
 		// This will later get removed by UnusedVariableRemover.
 		if(result_name.empty())
-			result_name = "msp_unused_from_inline";
+			result_name = "_msp_unused_from_inline";
 
 		RefPtr<VariableReference> ref = new VariableReference;
 		ref->name = result_name;