diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-08 18:41:08 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-17 10:05:20 -0600 |
| commit | cf3b64d885196183202f412d5330ad78dd49db23 (patch) | |
| tree | 96f01dd9a75b299e546696528d84ef7f670a2883 | |
| parent | d860980a76adcf764c04ed4c1779bcaeb820202c (diff) | |
| download | usermoji-cf3b64d885196183202f412d5330ad78dd49db23.tar.xz | |
vulkan: Updates to match upstream vulkan.h
| -rw-r--r-- | include/vk_debug_report_lunarg.h | 10 | ||||
| -rw-r--r-- | include/vk_wsi_lunarg.h | 5 | ||||
| -rw-r--r-- | loader/loader.c | 10 |
3 files changed, 12 insertions, 13 deletions
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; // ------------------------------------------------------------------------------------------------ diff --git a/loader/loader.c b/loader/loader.c index 75701cf2..07d0416c 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -68,11 +68,11 @@ static void * VKAPI loader_GetInstanceProcAddr(VkInstance instance, const char * static bool loader_init_ext_list(struct loader_extension_list *ext_info); enum loader_debug { - LOADER_INFO_BIT = VK_BIT(0), - LOADER_WARN_BIT = VK_BIT(1), - LOADER_PERF_BIT = VK_BIT(2), - LOADER_ERROR_BIT = VK_BIT(3), - LOADER_DEBUG_BIT = VK_BIT(4), + LOADER_INFO_BIT = 0x01, + LOADER_WARN_BIT = 0x02, + LOADER_PERF_BIT = 0x04, + LOADER_ERROR_BIT = 0x08, + LOADER_DEBUG_BIT = 0x10, }; uint32_t g_loader_debug = 0; |