From bc1d21da9899fec48f60166a1a1bff23f7d02317 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Wed, 14 Sep 2016 11:24:36 -0600 Subject: loader: Fixes for ICD vk{Create|Destroy}SurfaceKHR Need to keep VkIcdSurface private to the loader. The definition may conflict with some redefinitions of VK_DEFINE_NON_DISPATCHABLE_HANDLE and it's not necessary to make public anyway. Change-Id: I30e166f0ecce2fd3ea36c745dc073b705973d75f --- include/vulkan/vk_icd.h | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'include') diff --git a/include/vulkan/vk_icd.h b/include/vulkan/vk_icd.h index 39442fb0..c26d1f74 100644 --- a/include/vulkan/vk_icd.h +++ b/include/vulkan/vk_icd.h @@ -122,30 +122,4 @@ typedef struct { VkExtent2D imageExtent; } VkIcdSurfaceDisplay; -typedef struct { - union { -#ifdef VK_USE_PLATFORM_MIR_KHR - VkIcdSurfaceMir mir_surf; -#endif // VK_USE_PLATFORM_MIR_KHR -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - VkIcdSurfaceWayland wayland_surf; -#endif // VK_USE_PLATFORM_WAYLAND_KHR -#ifdef VK_USE_PLATFORM_WIN32_KHR - VkIcdSurfaceWin32 win_surf; -#endif // VK_USE_PLATFORM_WIN32_KHR -#ifdef VK_USE_PLATFORM_XCB_KHR - VkIcdSurfaceXcb xcb_surf; -#endif // VK_USE_PLATFORM_XCB_KHR -#ifdef VK_USE_PLATFORM_XLIB_KHR - VkIcdSurfaceXlib xlib_surf; -#endif // VK_USE_PLATFORM_XLIB_KHR - VkIcdSurfaceDisplay display_surf; - }; - uint32_t base_size; // Size of VkIcdSurfaceBase - uint32_t platform_size; // Size of corresponding VkIcdSurfaceXXX - uint32_t non_platform_offset; // Start offset to base_size - uint32_t entire_size; // Size of entire VkIcdSurface - VkSurfaceKHR *real_icd_surfaces; -} VkIcdSurface; - #endif // VKICD_H -- cgit v1.2.3