From: Pyry Haulos <phaulos@google.com>
Date: Tue, 11 Oct 2016 15:57:23 +0000 (+0000)
Subject: Revert "DO NOT MERGE Check only valid usages in image format query tests"
X-Git-Tag: upstream/0.1.0~445^2~6^2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a98f95c0344dabb81e8748b37c084de0d853bca;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Bug: 31732496

This reverts commit c41d4d842779226853f8338e45aa3336b92e2699.

Change-Id: Ie27f075e0f0abb9e5172e2b0420b87d0d08750ad
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 0074fc2..65c077d 100644
--- 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;
 }