From: mnetsch <mnetsch@qti.qualcomm.com>
Date: Thu, 25 Feb 2016 21:50:01 +0000 (-0500)
Subject: Fixes format_properties test with required formats from Vulkan 1.0 spec
X-Git-Tag: upstream/0.1.0~812^2~43^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5703e21097550b4fcfbb86f232522bc3323e6ac;p=platform%2Fupstream%2FVK-GL-CTS.git

Fixes format_properties test with required formats from Vulkan 1.0 spec

Related to issue #294
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
old mode 100644
new mode 100755
index aebb703..6de9122
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -624,21 +624,14 @@ VkFormatFeatureFlags getRequiredOptimalTilingFeatures (VkFormat format)
 		VK_FORMAT_A8B8G8R8_UINT_PACK32,
 		VK_FORMAT_A8B8G8R8_SINT_PACK32,
 		VK_FORMAT_A8B8G8R8_SRGB_PACK32,
-		VK_FORMAT_A2R10G10B10_UNORM_PACK32,
 		VK_FORMAT_A2B10G10R10_UNORM_PACK32,
 		VK_FORMAT_A2B10G10R10_UINT_PACK32,
-		VK_FORMAT_R16_UNORM,
-		VK_FORMAT_R16_SNORM,
 		VK_FORMAT_R16_UINT,
 		VK_FORMAT_R16_SINT,
 		VK_FORMAT_R16_SFLOAT,
-		VK_FORMAT_R16G16_UNORM,
-		VK_FORMAT_R16G16_SNORM,
 		VK_FORMAT_R16G16_UINT,
 		VK_FORMAT_R16G16_SINT,
 		VK_FORMAT_R16G16_SFLOAT,
-		VK_FORMAT_R16G16B16A16_UNORM,
-		VK_FORMAT_R16G16B16A16_SNORM,
 		VK_FORMAT_R16G16B16A16_UINT,
 		VK_FORMAT_R16G16B16A16_SINT,
 		VK_FORMAT_R16G16B16A16_SFLOAT,
@@ -685,39 +678,29 @@ VkFormatFeatureFlags getRequiredOptimalTilingFeatures (VkFormat format)
 		VK_FORMAT_R5G6B5_UNORM_PACK16,
 		VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 		VK_FORMAT_R8_UNORM,
-		VK_FORMAT_R8_SNORM,
 		VK_FORMAT_R8_UINT,
 		VK_FORMAT_R8_SINT,
 		VK_FORMAT_R8G8_UNORM,
-		VK_FORMAT_R8G8_SNORM,
 		VK_FORMAT_R8G8_UINT,
 		VK_FORMAT_R8G8_SINT,
 		VK_FORMAT_R8G8B8A8_UNORM,
-		VK_FORMAT_R8G8B8A8_SNORM,
 		VK_FORMAT_R8G8B8A8_UINT,
 		VK_FORMAT_R8G8B8A8_SINT,
 		VK_FORMAT_R8G8B8A8_SRGB,
 		VK_FORMAT_B8G8R8A8_UNORM,
 		VK_FORMAT_B8G8R8A8_SRGB,
 		VK_FORMAT_A8B8G8R8_UNORM_PACK32,
-		VK_FORMAT_A8B8G8R8_SNORM_PACK32,
 		VK_FORMAT_A8B8G8R8_UINT_PACK32,
 		VK_FORMAT_A8B8G8R8_SINT_PACK32,
 		VK_FORMAT_A8B8G8R8_SRGB_PACK32,
 		VK_FORMAT_A2B10G10R10_UNORM_PACK32,
 		VK_FORMAT_A2B10G10R10_UINT_PACK32,
-		VK_FORMAT_R16_UNORM,
-		VK_FORMAT_R16_SNORM,
 		VK_FORMAT_R16_UINT,
 		VK_FORMAT_R16_SINT,
 		VK_FORMAT_R16_SFLOAT,
-		VK_FORMAT_R16G16_UNORM,
-		VK_FORMAT_R16G16_SNORM,
 		VK_FORMAT_R16G16_UINT,
 		VK_FORMAT_R16G16_SINT,
 		VK_FORMAT_R16G16_SFLOAT,
-		VK_FORMAT_R16G16B16A16_UNORM,
-		VK_FORMAT_R16G16B16A16_SNORM,
 		VK_FORMAT_R16G16B16A16_UINT,
 		VK_FORMAT_R16G16B16A16_SINT,
 		VK_FORMAT_R16G16B16A16_SFLOAT,
@@ -736,26 +719,16 @@ VkFormatFeatureFlags getRequiredOptimalTilingFeatures (VkFormat format)
 		VK_FORMAT_R5G6B5_UNORM_PACK16,
 		VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 		VK_FORMAT_R8_UNORM,
-		VK_FORMAT_R8_SNORM,
 		VK_FORMAT_R8G8_UNORM,
-		VK_FORMAT_R8G8_SNORM,
 		VK_FORMAT_R8G8B8A8_UNORM,
-		VK_FORMAT_R8G8B8A8_SNORM,
 		VK_FORMAT_R8G8B8A8_SRGB,
 		VK_FORMAT_B8G8R8A8_UNORM,
 		VK_FORMAT_B8G8R8A8_SRGB,
 		VK_FORMAT_A8B8G8R8_UNORM_PACK32,
-		VK_FORMAT_A8B8G8R8_SNORM_PACK32,
 		VK_FORMAT_A8B8G8R8_SRGB_PACK32,
 		VK_FORMAT_A2B10G10R10_UNORM_PACK32,
-		VK_FORMAT_R16_UNORM,
-		VK_FORMAT_R16_SNORM,
 		VK_FORMAT_R16_SFLOAT,
-		VK_FORMAT_R16G16_UNORM,
-		VK_FORMAT_R16G16_SNORM,
 		VK_FORMAT_R16G16_SFLOAT,
-		VK_FORMAT_R16G16B16A16_UNORM,
-		VK_FORMAT_R16G16B16A16_SNORM,
 		VK_FORMAT_R16G16B16A16_SFLOAT
 	};
 	static const VkFormat s_requiredDepthStencilAttachmentFormats[] =
@@ -857,18 +830,12 @@ VkFormatFeatureFlags getRequiredBufferFeatures (VkFormat format)
 		VK_FORMAT_A8B8G8R8_SINT_PACK32,
 		VK_FORMAT_A2B10G10R10_UNORM_PACK32,
 		VK_FORMAT_A2B10G10R10_UINT_PACK32,
-		VK_FORMAT_R16_UNORM,
-		VK_FORMAT_R16_SNORM,
 		VK_FORMAT_R16_UINT,
 		VK_FORMAT_R16_SINT,
 		VK_FORMAT_R16_SFLOAT,
-		VK_FORMAT_R16G16_UNORM,
-		VK_FORMAT_R16G16_SNORM,
 		VK_FORMAT_R16G16_UINT,
 		VK_FORMAT_R16G16_SINT,
 		VK_FORMAT_R16G16_SFLOAT,
-		VK_FORMAT_R16G16B16A16_UNORM,
-		VK_FORMAT_R16G16B16A16_SNORM,
 		VK_FORMAT_R16G16B16A16_UINT,
 		VK_FORMAT_R16G16B16A16_SINT,
 		VK_FORMAT_R16G16B16A16_SFLOAT,