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

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 8008465e..a7f29a16 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -1284,36 +1284,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);