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=7b3f8f28c8ad00007b520446ed5c2cc1180c49d0;hp=6ac84b5b0247be7c48ffe3339ba288c1d047ab3c;hb=4fb346536bfefd612635a248f558b1f1471deae6;hpb=4942472d6429a52ac1f03fbaffd57d011624c54a

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 6ac84b5b..7b3f8f28 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -186,8 +186,11 @@ void InlineContentInjector::visit(VariableDeclaration &var)
 
 	if(pass==RENAME)
 	{
+		/* Check against conflicts with the other context as well as variables
+		already renamed here. */
+		bool conflict = (staging_block.variables.count(var.name) || referenced_names.count(var.name));
 		staging_block.variables[var.name] = &var;
-		if(referenced_names.count(var.name))
+		if(conflict)
 		{
 			string mapped_name = get_unused_variable_name(staging_block, var.name);
 			if(mapped_name!=var.name)
@@ -265,12 +268,12 @@ void FunctionInliner::visit(Block &block)
 
 void FunctionInliner::visit(FunctionCall &call)
 {
+	for(NodeArray<Expression>::iterator i=call.arguments.begin(); (!r_inlined_here && i!=call.arguments.end()); ++i)
+		visit(*i);
+
 	if(r_inlined_here)
 		return;
 
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		visit(*i);
-
 	FunctionDeclaration *def = call.declaration;
 	if(def)
 		def = def->definition;