From cf3b64d885196183202f412d5330ad78dd49db23 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 8 Jul 2015 18:41:08 -0600 Subject: vulkan: Updates to match upstream vulkan.h --- include/vk_debug_report_lunarg.h | 10 +++++----- include/vk_wsi_lunarg.h | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h index eef78364..6bdd1061 100644 --- a/include/vk_debug_report_lunarg.h +++ b/include/vk_debug_report_lunarg.h @@ -160,11 +160,11 @@ VK_DEFINE_NONDISP_HANDLE(VkDbgMsgCallback) typedef enum VkDbgReportFlags_ { - VK_DBG_REPORT_INFO_BIT = VK_BIT(0), - VK_DBG_REPORT_WARN_BIT = VK_BIT(1), - VK_DBG_REPORT_PERF_WARN_BIT = VK_BIT(2), - VK_DBG_REPORT_ERROR_BIT = VK_BIT(3), - VK_DBG_REPORT_DEBUG_BIT = VK_BIT(4), + VK_DBG_REPORT_INFO_BIT = 0x0001, + VK_DBG_REPORT_WARN_BIT = 0x0002, + VK_DBG_REPORT_PERF_WARN_BIT = 0x0004, + VK_DBG_REPORT_ERROR_BIT = 0x0008, + VK_DBG_REPORT_DEBUG_BIT = 0x0010, } VkDbgReportFlags; // Debug Report ERROR codes diff --git a/include/vk_wsi_lunarg.h b/include/vk_wsi_lunarg.h index 4a869623..a986301d 100644 --- a/include/vk_wsi_lunarg.h +++ b/include/vk_wsi_lunarg.h @@ -64,7 +64,6 @@ typedef enum VkSwapChainInfoTypeWSI_ // Info type for vkGetSwapChainInfo() VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI = 0x00000000, // Return information about the persistent images of the swapchain - VK_ENUM_RANGE(SWAP_CHAIN_INFO_TYPE, PERSISTENT_IMAGES_WSI, PERSISTENT_IMAGES_WSI) } VkSwapChainInfoTypeWSI; // ------------------------------------------------------------------------------------------------ @@ -73,8 +72,8 @@ typedef enum VkSwapChainInfoTypeWSI_ typedef VkFlags VkSwapModeFlagsWSI; typedef enum VkSwapModeFlagBitsWSI_ { - VK_SWAP_MODE_FLIP_BIT_WSI = VK_BIT(0), - VK_SWAP_MODE_BLIT_BIT_WSI = VK_BIT(1), + VK_SWAP_MODE_FLIP_BIT_WSI = 0x1, + VK_SWAP_MODE_BLIT_BIT_WSI = 0x2 } VkSwapModeFlagBitsWSI; // ------------------------------------------------------------------------------------------------ -- cgit v1.2.3