From: Mika Isojärvi <misojarvi@google.com>
Date: Fri, 7 Oct 2016 00:26:22 +0000 (-0700)
Subject: DO NOT MERGE Check only valid usages in image format query tests
X-Git-Tag: upstream/0.1.0~368^2^2^2^2^2^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b04065130fe765dd02a8290e74adbdb49bd567b4;hp=73f59526bce780cc37f1e4712a81d973193a334d;p=platform%2Fupstream%2FVK-GL-CTS.git

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)
---

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;
 }