From: Matthew Netsch <quic_mnetsch@quicinc.com>
Date: Wed, 16 Jan 2019 19:36:30 +0000 (-0500)
Subject: Fixes ycbcr image properties requirement
X-Git-Tag: upstream/1.3.5~2185^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=845394de5b43c71adddc72e7563b50c65e852b27;p=platform%2Fupstream%2FVK-GL-CTS.git

Fixes ycbcr image properties requirement

Mipmaps/Arrays are optional for ycbcr images

Components: Vulkan
VK-GL-CTS issue: 1506

Affects:
dEQP-VK.api.info.image_format_properties.*

Change-Id: I795ec1c8b3e44a460ddd0c7c2fe0fe1731794cab
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 6286caa..f6eff6d 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -2677,9 +2677,10 @@ tcu::TestStatus imageFormatProperties (Context& context, const VkFormat format,
 																	properties.maxExtent.height	>= deviceLimits.maxImageDimension3D &&
 																	properties.maxExtent.depth	>= deviceLimits.maxImageDimension3D),
 								  "Reported dimensions smaller than device limits");
-					results.check(properties.maxMipLevels == fullMipPyramidSize, "maxMipLevels is not full mip pyramid size");
-					results.check(imageType == VK_IMAGE_TYPE_3D || properties.maxArrayLayers >= deviceLimits.maxImageArrayLayers,
-								  "maxArrayLayers smaller than device limits");
+					results.check((isYCbCrFormat(format) && (properties.maxMipLevels == 1)) || properties.maxMipLevels == fullMipPyramidSize,
+					              "Invalid mip pyramid size");
+					results.check((isYCbCrFormat(format) && (properties.maxArrayLayers == 1)) || imageType == VK_IMAGE_TYPE_3D ||
+					              properties.maxArrayLayers >= deviceLimits.maxImageArrayLayers, "Invalid maxArrayLayers");
 				}
 				else
 				{