From: mnetsch <mnetsch@qti.qualcomm.com>
Date: Tue, 1 Mar 2016 20:48:28 +0000 (-0500)
Subject: Fixes ImageBlitFromImage tests scaling blit verification code
X-Git-Tag: upstream/0.1.0~812^2~36^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27b97decec500019f93d6b09b84da70af75324d1;p=platform%2Fupstream%2FVK-GL-CTS.git

Fixes ImageBlitFromImage tests scaling blit verification code

Fixes #319
---

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
old mode 100644
new mode 100755
index ad3659a..c9d8c24
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -3835,7 +3835,9 @@ void ImageBlitFromImage::verify (VerifyContext& context, size_t)
 		}
 		else if (m_scale == BLIT_SCALE_20)
 		{
-			tcu::TextureLevel source (TextureFormat(TextureFormat::RGBA, TextureFormat::UNORM_INT8), m_srcImageWidth, m_srcImageHeight);
+			tcu::TextureLevel	source	(TextureFormat(TextureFormat::RGBA, TextureFormat::UNORM_INT8), m_srcImageWidth, m_srcImageHeight);
+			const float			xscale	= ((float)m_srcImageWidth)  / (float)m_imageWidth;
+			const float			yscale	= ((float)m_srcImageHeight) / (float)m_imageHeight;
 
 			for (deInt32 y = 0; y < m_srcImageHeight; y++)
 			for (deInt32 x = 0; x < m_srcImageWidth; x++)
@@ -3850,7 +3852,7 @@ void ImageBlitFromImage::verify (VerifyContext& context, size_t)
 
 			for (deInt32 y = 0; y < m_imageHeight; y++)
 			for (deInt32 x = 0; x < m_imageWidth; x++)
-				refAccess.setPixel(source.getAccess().getPixelUint(x / 2, y / 2), x, y);
+				refAccess.setPixel(source.getAccess().getPixelUint(int(x * xscale), int(y * yscale)), x, y);
 		}
 		else
 			DE_FATAL("Unsupported scale");