Revert "DO NOT MERGE Check only valid usages in image format query tests"

Bug: 31732496

This reverts commit c41d4d842779226853f8338e45aa3336b92e2699.

Change-Id: Ie27f075e0f0abb9e5172e2b0420b87d0d08750ad
(cherry picked from commit 2a98f95c0344dabb81e8748b37c084de0d853bca)

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 0074fc24ab7984f73d5b06d7d312028a53efa650..65c077d8b73c7d9aa96fbc87e0c9bb7eac098c79 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -1657,16 +1657,6 @@ 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;
 }