From 0c8c7865ad3695dac93d50eebf0d470c766817a8 Mon Sep 17 00:00:00 2001 From: Szymon Szczyrbak Date: Mon, 24 Jun 2019 09:21:33 +0200 Subject: [PATCH] Fix wrong image usage flags in api feature info tests According to spec: "If usage includes VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT, usage must also contain at least one of VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, or VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT." This change adds isValidImageUsageFlagCombination() checks, so invalid usage flag combinations are not used in test. VK-GL-CTS Issue: 1850 Components: Vulkan Affects: dEQP-VK.api.info.image_format_properties2.* dEQP-VK.api.info.sparse_image_format_properties2.* Change-Id: Ibc0249686c6ee91ab3758918ab4067694730134c --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index c50e72a..ad25a58 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -3207,6 +3207,9 @@ tcu::TestStatus imageFormatProperties2 (Context& context, const VkFormat format, for (VkImageUsageFlags curUsageFlags = (VkImageUsageFlags)1; curUsageFlags <= allUsageFlags; curUsageFlags++) { + if (!isValidImageUsageFlagCombination(curUsageFlags)) + continue; + for (VkImageCreateFlags curCreateFlags = 0; curCreateFlags <= allCreateFlags; curCreateFlags++) { const VkPhysicalDeviceImageFormatInfo2 imageFormatInfo = @@ -3273,6 +3276,9 @@ tcu::TestStatus sparseImageFormatProperties2 (Context& context, const VkFormat f { for (VkImageUsageFlags curUsageFlags = (VkImageUsageFlags)1; curUsageFlags <= allUsageFlags; curUsageFlags++) { + if (!isValidImageUsageFlagCombination(curUsageFlags)) + continue; + const VkPhysicalDeviceSparseImageFormatInfo2 imageFormatInfo = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2, -- 2.7.4