From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 12 Oct 2016 18:03:31 +0000 (+0100)
Subject: copy_and_blit.blit_image: fix threshold computation
X-Git-Tag: upstream/0.1.0~662^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=161314f0ff255dfe47e280dd4945292295dab1ed;hp=ef115082bbb62e6c8d71ed2ec76f99cb47725b74;p=platform%2Fupstream%2FVK-GL-CTS.git

copy_and_blit.blit_image: fix threshold computation

Threshold should not be ceiled, affecting all blit tests with
floating point format as destination :

dEQP-VK.api.copy_and_blit.blit_image.all_formats.*sfloat*

Also use the source texture to get the source format.

Fixes #516

Change-Id: I4c49007070306d597e36f7b79ee969ef5081d19e
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index 88986ef..c5b815b 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -1722,7 +1722,7 @@ static float calculateFloatConversionError (int srcBits)
 	{
 		const int	clampedBits	= de::clamp<int>(srcBits, 0, 32);
 		const float	srcMaxValue	= de::max((float)(1ULL<<clampedBits) - 1.0f, 1.0f);
-		const float	error		= deFloatCeil(1.0f / srcMaxValue);
+		const float	error		= 1.0f / srcMaxValue;
 
 		return de::clamp<float>(error, 0.0f, 1.0f);
 	}
@@ -1746,7 +1746,7 @@ bool BlittingImages::checkClampedAndUnclampedResult(const tcu::ConstPixelBufferA
 {
 	tcu::TestLog&				log			(m_context.getTestContext().getLog());
 	const bool					isLinear	= m_params.filter == VK_FILTER_LINEAR;
-	const tcu::TextureFormat	srcFormat	= clampedExpected.getFormat();
+	const tcu::TextureFormat	srcFormat	= m_sourceTextureLevel->getFormat();
 	const tcu::TextureFormat	dstFormat	= result.getFormat();
 	bool						isOk		= false;