From: Pyry Haulos <phaulos@google.com>
Date: Mon, 26 Sep 2016 16:04:55 +0000 (-0700)
Subject: Fix VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT handling in query tests
X-Git-Tag: upstream/0.1.0~662^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=570326e5c8d85fe16fa6ce36de73c8f9bcba4d3e;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT handling in query tests

83f90be9 added a check that was intended to make tests treat combination
of TRANSIENT_ATTACHMENT_BIT with non-RT usages invalid. However, that
change was buggy and lead the tests to treat _all_ usages of
TRANSIENT_ATTACHMENT_BIT invalid and thus skip testing them.

Change-Id: I512fbea6046a5c1a87e2ea957eebe38ac713ac87
---

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 6cec3f8..e1f2a6d 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -1693,7 +1693,10 @@ bool isValidImageUsageFlagCombination (VkImageUsageFlags usage)
 {
 	if (usage & vk::VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT)
 	{
-		const VkImageUsageFlags		allowedFlags	= vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | vk::VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | vk::VK_IMAGE_USAGE_INPUT_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;
 	}
 	return usage != 0;