X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=ea0f96f0e60920cba9dd23523e83c37a07133ffb;hb=0d5ff7918d50092d8cf2e1b8f7af1d7d29b6eb9b;hp=96a75d603d6db5bdaaae35de41bbe16fb938cecf;hpb=fa9cb2b366b9616924f4bbff5dc592d141795c26;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 96a75d60..ea0f96f0 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -114,9 +114,13 @@ string InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_fu
 	source_func = call.declaration->definition;
 
 	/* Populate referenced_names from the target function so we can rename
-	variables from the inlined function that would conflict. */
+	variables from the inlined function that would conflict.  Only consider
+	names which declared in blocks linearly related to the target block. */
 	pass = REFERENCED;
-	target_func.visit(*this);
+	tgt_blk.visit(*this);
+	for(const Block *b=&tgt_blk; b; b=b->parent)
+		for(const auto &kvp: b->variables)
+			referenced_names.insert(kvp.first);
 
 	/* Inline and rename passes must be interleaved so used variable names are
 	known when inlining the return statement. */
@@ -1053,10 +1057,11 @@ void ConstantFolder::visit(Iteration &iter)
 }
 
 
-void ConstantConditionEliminator::apply(Stage &stage)
+bool ConstantConditionEliminator::apply(Stage &stage)
 {
 	stage.content.visit(*this);
 	NodeRemover().apply(stage, nodes_to_remove);
+	return !nodes_to_remove.empty();
 }
 
 ConstantConditionEliminator::ConstantStatus ConstantConditionEliminator::check_constant_condition(const Expression &expr)