diff options
| author | Ian Elliott <ian@lunarg.com> | 2015-08-21 15:09:33 -0600 |
|---|---|---|
| committer | Ian Elliott <ian@lunarg.com> | 2015-09-04 14:58:09 -0600 |
| commit | a07819775a66866cb33718ae70d290c477867be6 (patch) | |
| tree | 37e841421a9f2e4de54dc7912203b737bcfa628d /include | |
| parent | 3ead413d3f9328eb7855ea538dc559bb98665608 (diff) | |
| download | usermoji-a07819775a66866cb33718ae70d290c477867be6.tar.xz | |
WSI: Convert WSI swapchain extension usage to new KHR style
Diffstat (limited to 'include')
| -rw-r--r-- | include/vk_debug_report_lunarg.h | 2 | ||||
| -rw-r--r-- | include/vk_layer.h | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h index a8705a12..eeb84251 100644 --- a/include/vk_debug_report_lunarg.h +++ b/include/vk_debug_report_lunarg.h @@ -79,7 +79,7 @@ typedef enum { VK_OBJECT_TYPE_FRAMEBUFFER = 30, VK_OBJECT_TYPE_RENDER_PASS = 31, VK_OBJECT_TYPE_PIPELINE_CACHE = 32, - VK_OBJECT_TYPE_SWAP_CHAIN_WSI = 33, + VK_OBJECT_TYPE_SWAPCHAIN_KHR = 33, VK_OBJECT_TYPE_CMD_POOL = 34, VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE, VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_CMD_POOL, diff --git a/include/vk_layer.h b/include/vk_layer.h index 886ca2d3..721dfb2b 100644 --- a/include/vk_layer.h +++ b/include/vk_layer.h @@ -7,8 +7,8 @@ #include "vulkan.h" #include "vk_debug_report_lunarg.h" #include "vk_debug_marker_lunarg.h" -#include "vk_wsi_swapchain.h" -#include "vk_wsi_device_swapchain.h" +#include "vk_ext_khr_swapchain.h" +#include "vk_ext_khr_device_swapchain.h" #if defined(__GNUC__) && __GNUC__ >= 4 # define VK_LAYER_EXPORT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) @@ -167,14 +167,14 @@ typedef struct VkLayerDispatchTable_ PFN_vkCmdNextSubpass CmdNextSubpass; PFN_vkCmdEndRenderPass CmdEndRenderPass; PFN_vkCmdExecuteCommands CmdExecuteCommands; - PFN_vkGetSurfacePropertiesWSI GetSurfacePropertiesWSI; - PFN_vkGetSurfaceFormatsWSI GetSurfaceFormatsWSI; - PFN_vkGetSurfacePresentModesWSI GetSurfacePresentModesWSI; - PFN_vkCreateSwapChainWSI CreateSwapChainWSI; - PFN_vkDestroySwapChainWSI DestroySwapChainWSI; - PFN_vkGetSwapChainImagesWSI GetSwapChainImagesWSI; - PFN_vkAcquireNextImageWSI AcquireNextImageWSI; - PFN_vkQueuePresentWSI QueuePresentWSI; + PFN_vkGetSurfacePropertiesKHR GetSurfacePropertiesKHR; + PFN_vkGetSurfaceFormatsKHR GetSurfaceFormatsKHR; + PFN_vkGetSurfacePresentModesKHR GetSurfacePresentModesKHR; + PFN_vkCreateSwapchainKHR CreateSwapchainKHR; + PFN_vkDestroySwapchainKHR DestroySwapchainKHR; + PFN_vkGetSwapchainImagesKHR GetSwapchainImagesKHR; + PFN_vkAcquireNextImageKHR AcquireNextImageKHR; + PFN_vkQueuePresentKHR QueuePresentKHR; PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; } VkLayerDispatchTable; @@ -195,7 +195,7 @@ typedef struct VkLayerInstanceDispatchTable_ PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties; PFN_vkGetPhysicalDeviceLayerProperties GetPhysicalDeviceLayerProperties; - PFN_vkGetPhysicalDeviceSurfaceSupportWSI GetPhysicalDeviceSurfaceSupportWSI; + PFN_vkGetPhysicalDeviceSurfaceSupportKHR GetPhysicalDeviceSurfaceSupportKHR; PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; } VkLayerInstanceDispatchTable; |