From: Alexander Galazin <alexander.galazin@arm.com>
Date: Wed, 16 Aug 2017 18:23:48 +0000 (+0000)
Subject: Merge "Fix error double accounting in fuzzyCompare()" am: 0cf17c4bf8
X-Git-Tag: upstream/0.1.0^2^2~59^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aca02e1db58f544210a5885d744ab309e186d1f1;hp=b50ad0b93208f6b30f8c8fc1ad3223930c396963;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "Fix error double accounting in fuzzyCompare()" am: 0cf17c4bf8
am: f64327185c

Change-Id: I5a42417bee0eab58fc2cae3a653e41e4624cb2eb
---

diff --git a/framework/common/tcuFuzzyImageCompare.cpp b/framework/common/tcuFuzzyImageCompare.cpp
index 596ab83..4e76476 100644
--- a/framework/common/tcuFuzzyImageCompare.cpp
+++ b/framework/common/tcuFuzzyImageCompare.cpp
@@ -318,7 +318,7 @@ float fuzzyCompare (const FuzzyCompareParams& params, const ConstPixelBufferAcce
 
 	for (int y = 1; y < height-1; y++)
 	{
-		for (int x = 1; x < width-1; x += params.maxSampleSkip > 0 ? (int)rnd.getInt(0, params.maxSampleSkip) : 1)
+		for (int x = 1; x < width-1; x += 1 + (int)rnd.getInt(0, params.maxSampleSkip))
 		{
 			const deUint32	minDist2RefToCmp	= distSquaredToNeighbor<4>(rnd, readUnorm8<4>(refAccess, x, y), cmpAccess, x, y);
 			const deUint32	minDist2CmpToRef	= distSquaredToNeighbor<4>(rnd, readUnorm8<4>(cmpAccess, x, y), refAccess, x, y);