From: Boris Zanin <boris.zanin@mobica.com>
Date: Thu, 24 Aug 2017 08:29:06 +0000 (+0200)
Subject: VK_KHR_maintenance2: View block-compressed speedup
X-Git-Tag: upstream/0.1.0~9^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06b7b26cabac6e8c2634be905cc814677aea5c02;p=platform%2Fupstream%2FVK-GL-CTS.git

VK_KHR_maintenance2: View block-compressed speedup

Do strict comparison first, if it fails use fuzzy.

Update tests:
* dEQP-VK.image.texel_view_compatible.compute.*

Components: Vulkan

VK-GL-CTS issue: 124

Change-Id: I1ad580d60638ba3fce83fc913819608d5d9a8812
(cherry picked from commit c9e2dea449429762592af0530b609cf80ab913ce)
---

diff --git a/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp b/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
index c0a2793..d33b206 100644
--- a/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
@@ -1140,20 +1140,16 @@ bool BasicComputeTestInstance::decompressImage (const VkCommandBuffer&	cmdBuffer
 		invalidateMappedMemoryRange(vk, device, resultAlloc.getMemory(), resultAlloc.getOffset(), bufferSize);
 		invalidateMappedMemoryRange(vk, device, referenceAlloc.getMemory(), referenceAlloc.getOffset(), bufferSize);
 
-		ConstPixelBufferAccess	resultPixels		(mapVkFormat(decompressedImageInfo.format), decompressedImageInfo.extent.width, decompressedImageInfo.extent.height, decompressedImageInfo.extent.depth, resultAlloc.getHostPtr());
-		ConstPixelBufferAccess	referencePixels		(mapVkFormat(decompressedImageInfo.format), decompressedImageInfo.extent.width, decompressedImageInfo.extent.height, decompressedImageInfo.extent.depth, referenceAlloc.getHostPtr());
-
-		if (decompressedImageInfo.extent.width > 2)
+		if (deMemCmp(resultAlloc.getHostPtr(), referenceAlloc.getHostPtr(), (size_t)bufferSize) != 0)
 		{
+			ConstPixelBufferAccess	resultPixels		(mapVkFormat(decompressedImageInfo.format), decompressedImageInfo.extent.width, decompressedImageInfo.extent.height, decompressedImageInfo.extent.depth, resultAlloc.getHostPtr());
+			ConstPixelBufferAccess	referencePixels		(mapVkFormat(decompressedImageInfo.format), decompressedImageInfo.extent.width, decompressedImageInfo.extent.height, decompressedImageInfo.extent.depth, referenceAlloc.getHostPtr());
+
 			if(!fuzzyCompare(m_context.getTestContext().getLog(), "Image Comparison", "Image Comparison", resultPixels, referencePixels, 0.001f, tcu::COMPARE_LOG_EVERYTHING))
 				return false;
 		}
-		else
-		{
-			if (deMemCmp(resultAlloc.getHostPtr(), referenceAlloc.getHostPtr(), (size_t)bufferSize))
-				return false;
-		}
 	}
+
 	return true;
 }