X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=c4118dee205d09f2f84c1e468001b6c6706de1c9;hb=03880839dcd2c067061ac5491083159a9fd06611;hp=220017971a2f75001cb6e30faeb4a4fecc2b9fa9;hpb=3a675b53b811f50ab965405fbbf91282cab7f3cd;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 22001797..c4118dee 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -74,6 +74,10 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 {
 	target_block = &tgt_blk;
 	source_func = &src;
+	remap_prefix = source_func->name;
+
+	vector<RefPtr<Statement> > inlined;
+	inlined.reserve(src.body.body.size());
 	for(NodeList<Statement>::iterator i=src.body.body.begin(); i!=src.body.body.end(); ++i)
 	{
 		r_inlined_statement = 0;
@@ -81,30 +85,23 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 		if(!r_inlined_statement)
 			r_inlined_statement = (*i)->clone();
 
-		SetFlag set_remap(remap_names);
+		SetForScope<unsigned> set_remap(remap_names, 2);
 		r_inlined_statement->visit(*this);
-		tgt_blk.body.insert(ins_pt, r_inlined_statement);
+		inlined.push_back(r_inlined_statement);
 	}
 
+	SetForScope<unsigned> set_remap(remap_names, 1);
+	SetForScope<string> set_prefix(remap_prefix, target_func.name);
+	variable_map.clear();
+	target_func.visit(*this);
+
+	tgt_blk.body.insert(ins_pt, inlined.begin(), inlined.end());
+
 	NodeReorderer().apply(stage, target_func, dependencies);
 
 	return r_result_name;
 }
 
-string InlineContentInjector::create_unused_name(const string &base, bool always_prefix)
-{
-	string result = base;
-	if(always_prefix || target_block->variables.count(result))
-		result = format("_%s_%s", source_func->name, base);
-	unsigned initial_size = result.size();
-	for(unsigned i=1; target_block->variables.count(result); ++i)
-	{
-		result.erase(initial_size);
-		result += format("_%d", i);
-	}
-	return result;
-}
-
 void InlineContentInjector::visit(VariableReference &var)
 {
 	if(remap_names)
@@ -116,7 +113,11 @@ void InlineContentInjector::visit(VariableReference &var)
 	else if(var.declaration)
 	{
 		SetFlag set_deps(deps_only);
-		dependencies.insert(var.declaration);
+		if(!variable_map.count(var.name))
+		{
+			dependencies.insert(var.declaration);
+			referenced_names.insert(var.name);
+		}
 		var.declaration->visit(*this);
 	}
 }
@@ -127,6 +128,7 @@ void InlineContentInjector::visit(InterfaceBlockReference &iface)
 	{
 		SetFlag set_deps(deps_only);
 		dependencies.insert(iface.declaration);
+		referenced_names.insert(iface.name);
 		iface.declaration->visit(*this);
 	}
 }
@@ -134,7 +136,10 @@ void InlineContentInjector::visit(InterfaceBlockReference &iface)
 void InlineContentInjector::visit(FunctionCall &call)
 {
 	if(!remap_names && call.declaration)
+	{
 		dependencies.insert(call.declaration);
+		referenced_names.insert(call.name);
+	}
 	TraversingVisitor::visit(call);
 }
 
@@ -142,32 +147,33 @@ void InlineContentInjector::visit(VariableDeclaration &var)
 {
 	TraversingVisitor::visit(var);
 
-	if(var.type_declaration)
+	if(remap_names)
+	{
+		if(remap_names==2 || referenced_names.count(var.name))
+		{
+			string mapped_name = get_unused_variable_name(*target_block, var.name, remap_prefix);
+			variable_map[var.name] = &var;
+			var.name = mapped_name;
+		}
+	}
+	else if(var.type_declaration)
 	{
 		SetFlag set_deps(deps_only);
 		dependencies.insert(var.type_declaration);
+		referenced_names.insert(var.type_declaration->name);
 		var.type_declaration->visit(*this);
 	}
-
-	if(!remap_names && !deps_only)
-	{
-		RefPtr<VariableDeclaration> inlined_var = var.clone();
-		inlined_var->name = create_unused_name(var.name, false);
-		r_inlined_statement = inlined_var;
-
-		variable_map[var.name] = inlined_var.get();
-	}
 }
 
 void InlineContentInjector::visit(Return &ret)
 {
 	TraversingVisitor::visit(ret);
 
-	if(ret.expression)
+	if(!remap_names && ret.expression)
 	{
 		/* Create a new variable to hold the return value of the inlined
 		function. */
-		r_result_name = create_unused_name("return", true);
+		r_result_name = get_unused_variable_name(*target_block, "_return", source_func->name);
 		RefPtr<VariableDeclaration> var = new VariableDeclaration;
 		var->source = ret.source;
 		var->line = ret.line;