From 5c477acb73186e4b6abe96c9b80b2e969f3b1a55 Mon Sep 17 00:00:00 2001 From: Gary Sweet Date: Wed, 6 Jun 2018 13:35:43 +0100 Subject: [PATCH] Don't assume sampling is allowed on linear-tiled YCbCr Linear-tiled formats do not have to support sampling. The api.image_format_properties tests were checking that sampling was supported for YCbCr in both optimal and linear tiling. Affects: dEQP-VK.api.info.image_format_properties.*.linear.* Components: Vulkan VK-GL-CTS issue : 1200 Change-Id: Id2c2aafaca66fe25ecee243f026315a87d3d7abf --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index e3d41dd..e56042c 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -2477,7 +2477,9 @@ tcu::TestStatus imageFormatProperties (Context& context, const VkFormat format, if (isYcbcrConversionSupported(context) && (format == VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR || format == VK_FORMAT_G8_B8R8_2PLANE_420_UNORM_KHR)) { - const VkFormatFeatureFlags requiredFeatures = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR | VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT_KHR; + VkFormatFeatureFlags requiredFeatures = VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR; + if (tiling == VK_IMAGE_TILING_OPTIMAL) + requiredFeatures |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT_KHR; results.check((supportedFeatures & requiredFeatures) == requiredFeatures, getFormatName(format) + string(" must support ") + de::toString(getFormatFeatureFlagsStr(requiredFeatures))); -- 2.7.4