From: Courtney Goeltzenleuchter Date: Fri, 17 Apr 2015 03:44:35 +0000 (-0600) Subject: bug-13466: Note conflict with upstream on VkQueryResultFlags X-Git-Tag: upstream/1.1.92~5717 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2e50e079a1c50bc68052c73d5c28b4181ae7865;p=platform%2Fupstream%2FVulkan-Tools.git bug-13466: Note conflict with upstream on VkQueryResultFlags --- diff --git a/include/vulkan.h b/include/vulkan.h index 0b8d2c5..d5ef3cb 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1095,6 +1095,7 @@ typedef enum VkQueryResultFlagBits_ { VK_QUERY_RESULT_32_BIT = 0, // Results of the queries are written to the destination buffer as 32-bit values VK_QUERY_RESULT_64_BIT = VK_BIT(0), // Results of the queries are written to the destination buffer as 64-bit values + // TODO: need to resolve removal of this enum. see bug 13466 for details // VK_QUERY_RESULT_NO_WAIT_BIT = 0, // Results of the queries aren't waited on before proceeding with the result copy VK_QUERY_RESULT_WAIT_BIT = VK_BIT(1), // Results of the queries are waited on before proceeding with the result copy VK_QUERY_RESULT_WITH_AVAILABILITY_BIT = VK_BIT(2), // Besides the results of the query, the availability of the results is also written