From: Mika Isojärvi <misojarvi@google.com>
Date: Wed, 18 Feb 2015 19:32:59 +0000 (-0800)
Subject: Skip NaN values when estimating pixel value range.
X-Git-Tag: upstream/0.1.0~1959^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf5839d6cd971f12b42fa07bd8a429a44130cc7e;p=platform%2Fupstream%2FVK-GL-CTS.git

Skip NaN values when estimating pixel value range.

Bug: 19379467
Change-Id: Idfb98ddd4bff47bb4cd6a77f6d4a870d303960a5
---

diff --git a/framework/common/tcuTextureUtil.cpp b/framework/common/tcuTextureUtil.cpp
index 97fbc9a..6224ae7 100644
--- a/framework/common/tcuTextureUtil.cpp
+++ b/framework/common/tcuTextureUtil.cpp
@@ -888,15 +888,15 @@ void estimatePixelValueRange (const ConstPixelBufferAccess& access, Vec4& minVal
 					{
 						Vec4 p = access.getPixel(x, y, z);
 
-						minVal[0] = de::min(minVal[0], p[0]);
-						minVal[1] = de::min(minVal[1], p[1]);
-						minVal[2] = de::min(minVal[2], p[2]);
-						minVal[3] = de::min(minVal[3], p[3]);
-
-						maxVal[0] = de::max(maxVal[0], p[0]);
-						maxVal[1] = de::max(maxVal[1], p[1]);
-						maxVal[2] = de::max(maxVal[2], p[2]);
-						maxVal[3] = de::max(maxVal[3], p[3]);
+						minVal[0] = (deFloatIsNaN(p[0]) ? minVal[0] : de::min(minVal[0], p[0]));
+						minVal[1] = (deFloatIsNaN(p[1]) ? minVal[1] : de::min(minVal[1], p[1]));
+						minVal[2] = (deFloatIsNaN(p[2]) ? minVal[2] : de::min(minVal[2], p[2]));
+						minVal[3] = (deFloatIsNaN(p[3]) ? minVal[3] : de::min(minVal[3], p[3]));
+
+						maxVal[0] = (deFloatIsNaN(p[0]) ? maxVal[0] : de::max(maxVal[0], p[0]));
+						maxVal[1] = (deFloatIsNaN(p[1]) ? maxVal[1] : de::max(maxVal[1], p[1]));
+						maxVal[2] = (deFloatIsNaN(p[2]) ? maxVal[2] : de::max(maxVal[2], p[2]));
+						maxVal[3] = (deFloatIsNaN(p[3]) ? maxVal[3] : de::max(maxVal[3], p[3]));
 					}
 				}
 			}