From ae008be234d27e5dd26ec0643cdefa059c4986b3 Mon Sep 17 00:00:00 2001 From: Graeme Leese Date: Wed, 30 Aug 2017 16:37:14 +0100 Subject: [PATCH] Change required sample counts for storage images Update the API feature info tests to set requiredSampleCounts to 1 for all images that are not usable as some type of framebuffer attachment. Previously images that were not usable as attachments but could be used as a storage image were incorrectly exempted from the requirement. Components: Vulkan VK-GL-CTS Issue: 645 Affects: dEQP-VK.api.info.image_format_properties.* Change-Id: Ia0d09ad0ff51029b75cd3a264860a3dd63c249fb --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index 26098eb..af8c011 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -2314,8 +2314,7 @@ tcu::TestStatus imageFormatProperties (Context& context, const VkFormat format, results.check(imageType != VK_IMAGE_TYPE_3D || properties.maxArrayLayers == 1, "Invalid maxArrayLayers for 3D image"); if (tiling == VK_IMAGE_TILING_OPTIMAL && imageType == VK_IMAGE_TYPE_2D && !(curCreateFlags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) && - ((supportedFeatures & (VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) || - ((supportedFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) && deviceFeatures.shaderStorageImageMultisample))) + (supportedFeatures & (VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))) { const VkSampleCountFlags requiredSampleCounts = getRequiredOptimalTilingSampleCounts(deviceLimits, format, curUsageFlags); results.check((properties.sampleCounts & requiredSampleCounts) == requiredSampleCounts, "Required sample counts not supported"); -- 2.7.4