From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 31 May 2016 18:42:02 +0000 (-0700)
Subject: image_clearing: Don't set a component mapping for the view to be cleared
X-Git-Tag: upstream/0.1.0~662^2~86^2~63^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd0fe2a62f68cefd04fd388bbe32465011a4e4aa;p=platform%2Fupstream%2FVK-GL-CTS.git

image_clearing: Don't set a component mapping for the view to be cleared

From the Vulkan 1.0.12 spec for VkComponentMapping:

    "This remapping must be identity for storage image descriptors, input
    attachment descriptors, and framebuffer attachments."

This fixes 6 CTS tests on the Intel Linux driver.
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
index 8d7e602..b504f86 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
@@ -514,7 +514,12 @@ Move<VkImageView> ImageClearingTestInstance::createImageView (VkImage image, VkI
 		image,										// VkImage						image;
 		viewType,									// VkImageViewType				viewType;
 		format,										// VkFormat						format;
-		getFormatComponentMapping(format),			// VkComponentMapping			components;
+		{
+			VK_COMPONENT_SWIZZLE_IDENTITY,				// VkComponentSwizzle			r;
+			VK_COMPONENT_SWIZZLE_IDENTITY,				// VkComponentSwizzle			g;
+			VK_COMPONENT_SWIZZLE_IDENTITY,				// VkComponentSwizzle			b;
+			VK_COMPONENT_SWIZZLE_IDENTITY,				// VkComponentSwizzle			a;
+		},											// VkComponentMapping			components;
 		{
 			aspectMask,									// VkImageAspectFlags			aspectMask;
 			0u,											// deUint32						baseMipLevel;