From d7130cb41fef9c36c41c8d3a3f60ae4b0b7484b6 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 16 Jun 2015 12:44:51 -0600 Subject: misc: Remove GetDisplayInfoWSI() This entry point was a challenge for loader to handle correctly. Since it is going away in the new WSI proposal remove it in all components. --- include/vkLayer.h | 1 - include/vk_wsi_lunarg.h | 13 ------------- 2 files changed, 14 deletions(-) (limited to 'include') diff --git a/include/vkLayer.h b/include/vkLayer.h index bdbb8e9c..6dcf1048 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -151,7 +151,6 @@ typedef struct VkLayerInstanceDispatchTable_ /* PFN_vkGetGlobalExtensionInfo GetGlobalExtensionInfo; non-dispatchable */ PFN_vkGetPhysicalDeviceExtensionInfo GetPhysicalDeviceExtensionInfo; PFN_vkGetMultiDeviceCompatibility GetMultiDeviceCompatibility; - PFN_vkGetDisplayInfoWSI GetDisplayInfoWSI; PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; PFN_vkDbgStringCallback DbgStringCallback; diff --git a/include/vk_wsi_lunarg.h b/include/vk_wsi_lunarg.h index 3507cfe8..40288622 100644 --- a/include/vk_wsi_lunarg.h +++ b/include/vk_wsi_lunarg.h @@ -67,13 +67,6 @@ VK_DEFINE_DISP_SUBCLASS_HANDLE(VkSwapChainWSI, VkObject) // ------------------------------------------------------------------------------------------------ // Enumerations -typedef enum VkDisplayInfoTypeWSI_ -{ - // Info type for vkGetDisplayInfo() - VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_WSI = 0x00000003, // Return the VkFormat(s) supported for swap chains with the display - - VK_ENUM_RANGE(DISPLAY_INFO_TYPE, FORMAT_PROPERTIES_WSI, FORMAT_PROPERTIES_WSI) -} VkDisplayInfoTypeWSI; typedef enum VkSwapChainInfoTypeWSI_ { @@ -154,7 +147,6 @@ typedef struct VkPresentInfoWSI_ // ------------------------------------------------------------------------------------------------ // Function types -typedef VkResult (VKAPI *PFN_vkGetDisplayInfoWSI)(VkDisplayWSI display, VkDisplayInfoTypeWSI infoType, size_t* pDataSize, void* pData); typedef VkResult (VKAPI *PFN_vkCreateSwapChainWSI)(VkDevice device, const VkSwapChainCreateInfoWSI* pCreateInfo, VkSwapChainWSI* pSwapChain); typedef VkResult (VKAPI *PFN_vkDestroySwapChainWSI)(VkSwapChainWSI swapChain); typedef VkResult (VKAPI *PFN_vkGetSwapChainInfoWSI)(VkSwapChainWSI swapChain, VkSwapChainInfoTypeWSI infoType, size_t* pDataSize, void* pData); @@ -165,11 +157,6 @@ typedef VkResult (VKAPI *PFN_vkQueuePresentWSI)(VkQueue queue, const VkPresentIn #ifdef VK_PROTOTYPES -VkResult VKAPI vkGetDisplayInfoWSI( - VkDisplayWSI display, - VkDisplayInfoTypeWSI infoType, - size_t* pDataSize, - void* pData); VkResult VKAPI vkCreateSwapChainWSI( VkDevice device, -- cgit v1.2.3