diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-04-07 13:50:42 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:33:28 +0800 |
| commit | 109b29d7494847efee84a85650ed650dddda21fa (patch) | |
| tree | cb1ca9aba6ef0315f66ec684ab2beb879856e169 | |
| parent | 244790e35e1c25fd4f694f3ff6015df76fc1f32c (diff) | |
| download | usermoji-109b29d7494847efee84a85650ed650dddda21fa.tar.xz | |
WSI fixes (Jon caught): new disp-obj macro + extend VkObjectType.
A recent "vulkan.h" header change means we should use the
VK_DEFINE_DISP_SUBCLASS_HANDLE() macor instead of the VK_DEFINE_HANDLE() macro.
Also, we needed to extend the VkObjectType enum/typedef.
| -rw-r--r-- | include/vk_wsi_lunarg.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/vk_wsi_lunarg.h b/include/vk_wsi_lunarg.h index 08ea5137..e36fe707 100644 --- a/include/vk_wsi_lunarg.h +++ b/include/vk_wsi_lunarg.h @@ -40,8 +40,8 @@ extern "C" // ------------------------------------------------------------------------------------------------ // Objects -VK_DEFINE_HANDLE(VkDisplayWSI); -VK_DEFINE_HANDLE(VkSwapChainWSI); +VK_DEFINE_DISP_SUBCLASS_HANDLE(VkDisplayWSI, VkObject) +VK_DEFINE_DISP_SUBCLASS_HANDLE(VkSwapChainWSI, VkObject) // ------------------------------------------------------------------------------------------------ // Enumeration constants @@ -59,6 +59,10 @@ VK_DEFINE_HANDLE(VkSwapChainWSI); // Extend VkImageLayout enum with extension specific constants #define VK_IMAGE_LAYOUT_PRESENT_SOURCE_WSI VK_WSI_LUNARG_ENUM(VkImageLayout, 0) +// Extend VkObjectType enum for new objects +#define VK_OBJECT_TYPE_DISPLAY_WSI VK_WSI_LUNARG_ENUM(VkObjectType, 0) +#define VK_OBJECT_TYPE_SWAP_CHAIN_WSI VK_WSI_LUNARG_ENUM(VkObjectType, 1) + // ------------------------------------------------------------------------------------------------ // Enumerations |