From b04065130fe765dd02a8290e74adbdb49bd567b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Thu, 6 Oct 2016 17:26:22 -0700 Subject: [PATCH 1/1] DO NOT MERGE Check only valid usages in image format query tests Skip image usage flags that contain VK__IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT and some incompatible bits or only VK__IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT. Bug: 31732496 Change-Id: I24a688005aaa2c1546842148492831e66b76c5e6 (cherry picked from commit c41d4d842779226853f8338e45aa3336b92e2699) --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index 65c077d..0074fc2 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -1657,6 +1657,16 @@ VkImageUsageFlags getValidImageUsageFlags (VkFormat, VkFormatFeatureFlags suppor bool isValidImageUsageFlagCombination (VkImageUsageFlags usage) { + if (usage & vk::VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT) + { + const VkImageUsageFlags allowedFlags = vk::VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT + | vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT + | vk::VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT + | vk::VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT; + + return (usage & ~allowedFlags) == 0 && usage != vk::VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT; + } + return usage != 0; } -- 2.7.4