X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=64ceddcc16ba92968c2f0d517f0230bb8e739598;hp=8008465e91344642f76e4fb66ae4a135e8bce66f;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=241cf36a6d7735706804bb3c517529bbe078f1ee

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 8008465e..64ceddcc 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. */
@@ -356,7 +360,7 @@ void ExpressionInliner::visit(RefPtr<Expression> &expr)
 		ExpressionUse use;
 		use.reference = &expr;
 		use.ref_scope = current_block;
-		use.blocked = access_write;
+		use.blocked = access_write || r_ref_info->blocked;
 
 		if(iteration_body && !r_ref_info->trivial)
 		{
@@ -402,7 +406,7 @@ void ExpressionInliner::visit(Swizzle &swizzle)
 
 void ExpressionInliner::visit(UnaryExpression &unary)
 {
-	SetFlag set_write(access_write, access_write || unary.oper->token[1]=='+' || unary.oper->token[1]=='-');
+	SetFlag set_write(access_write, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));
 	visit(unary.expression);
 	r_trivial = false;
 }
@@ -428,10 +432,10 @@ void ExpressionInliner::visit(Assignment &assign)
 	r_trivial = true;
 	visit(assign.right);
 
-	auto i = assignments.find(assign.target);
+	auto i = assignments.find(assign.target.declaration);
 	if(i!=assignments.end())
 	{
-		if(iteration_body && i->second->expression)
+		if(iteration_body && i->second && i->second->expression)
 		{
 			/* Block inlining into previous references within the iteration
 			statement.  On iterations after the first they would refer to the
@@ -441,6 +445,10 @@ void ExpressionInliner::visit(Assignment &assign)
 					u.blocked = (k==iteration_body);
 		}
 
+		for(; (i!=assignments.end() && i->first.declaration==assign.target.declaration); ++i)
+			if(targets_overlap(i->first, assign.target))
+				i->second->blocked = true;
+
 		expressions.push_back(ExpressionInfo());
 		ExpressionInfo &info = expressions.back();
 		info.target = assign.target;
@@ -450,7 +458,7 @@ void ExpressionInliner::visit(Assignment &assign)
 		info.assign_scope = current_block;
 		info.trivial = r_trivial;
 
-		i->second = &info;
+		assignments[assign.target] = &info;
 	}
 
 	r_trivial = false;
@@ -1284,36 +1292,12 @@ void UnusedVariableRemover::referenced(const Assignment::Target &target, Node &n
 	{
 		bool loop_external = false;
 		for(AssignmentInfo *a: var_info.assignments)
-		{
-			bool covered = true;
-			for(unsigned j=0; (covered && j<a->target.chain_len && j<target.chain_len); ++j)
-			{
-				Assignment::Target::ChainType type1 = static_cast<Assignment::Target::ChainType>(a->target.chain[j]&0xC0);
-				Assignment::Target::ChainType type2 = static_cast<Assignment::Target::ChainType>(target.chain[j]&0xC0);
-				unsigned index1 = a->target.chain[j]&0x3F;
-				unsigned index2 = target.chain[j]&0x3F;
-				if(type1==Assignment::Target::SWIZZLE || type2==Assignment::Target::SWIZZLE)
-				{
-					if(type1==Assignment::Target::SWIZZLE && type2==Assignment::Target::SWIZZLE)
-						covered = index1&index2;
-					else if(type1==Assignment::Target::ARRAY && index1<4)
-						covered = index2&(1<<index1);
-					else if(type2==Assignment::Target::ARRAY && index2<4)
-						covered = index1&(1<<index2);
-					/* If it's some other combination (shouldn't happen), leave
-					covered as true */
-				}
-				else
-					covered = (type1==type2 && (index1==index2 || index1==0x3F || index2==0x3F));
-			}
-
-			if(covered)
+			if(targets_overlap(a->target, target))
 			{
 				a->used_by.push_back(&node);
 				if(a->in_loop<in_loop)
 					loop_external = true;
 			}
-		}
 
 		if(loop_external)
 			loop_ext_refs.push_back(&node);