From: Jeff Bolz <jbolz@nvidia.com>
Date: Mon, 14 Dec 2015 21:13:56 +0000 (+0000)
Subject: fixes for renderpass.simple tests
X-Git-Tag: upstream/0.1.0~812^2~434^2~3^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3e06bac8ee2c4ccac086f1bfc3c2e833d9f154f;p=platform%2Fupstream%2FVK-GL-CTS.git

fixes for renderpass.simple tests
---

diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
index 007b85d..3d6e356 100644
--- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
@@ -1649,7 +1649,7 @@ Move<VkPipeline> createSubpassPipeline (const DeviceInterface&		vk,
 			VK_COMPARE_OP_ALWAYS,									// stencilCompareOp
 			~0u,													// stencilCompareMask
 			~0u,													// stencilWriteMask
-			~0u														// stencilReference
+			STENCIL_VALUE											// stencilReference
 		},															// front
 		{
 			VK_STENCIL_OP_REPLACE,									// stencilFailOp
@@ -1658,7 +1658,7 @@ Move<VkPipeline> createSubpassPipeline (const DeviceInterface&		vk,
 			VK_COMPARE_OP_ALWAYS,									// stencilCompareOp
 			~0u,													// stencilCompareMask
 			~0u,													// stencilWriteMask
-			~0u														// stencilReference
+			STENCIL_VALUE											// stencilReference
 		},															// back
 
 		-1.0f,														// minDepthBounds;
@@ -3250,7 +3250,7 @@ bool logAndVerifyImages (TestLog&											log,
 
 				const tcu::TextureFormat	stencilFormat		= tcu::getEffectiveDepthStencilTextureFormat(format, tcu::Sampler::MODE_STENCIL);
 				const VkDeviceSize			stencilBufferSize	= targetSize.x() * targetSize.y() * stencilFormat.getPixelSize();
-				void* const					stencilPtr			= attachmentResources[attachmentNdx]->getResultMemory().getHostPtr();
+				void* const					stencilPtr			= attachmentResources[attachmentNdx]->getSecondaryResultMemory().getHostPtr();
 
 				const VkMappedMemoryRange	ranges[] =
 				{
@@ -3272,7 +3272,7 @@ bool logAndVerifyImages (TestLog&											log,
 				VK_CHECK(vk.invalidateMappedMemoryRanges(device, 2u, ranges));
 
 				{
-					const ConstPixelBufferAccess	depthAccess		(depthFormat, targetSize.x(), targetSize.y(), 1, depthPtr);
+					const ConstPixelBufferAccess	depthAccess		(format, targetSize.x(), targetSize.y(), 1, depthPtr);
 					const ConstPixelBufferAccess	stencilAccess	(stencilFormat, targetSize.x(), targetSize.y(), 1, stencilPtr);
 					tcu::TextureLevel				errorImage		(tcu::TextureFormat(tcu::TextureFormat::RGBA, tcu::TextureFormat::UNORM_INT8), targetSize.x(), targetSize.y());