aboutsummaryrefslogtreecommitdiff
path: root/loader/loader.h
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2015-12-10 16:25:21 -0700
committerMark Lobodzinski <mark@lunarg.com>2015-12-11 15:32:58 -0700
commit159b7606b0784eb17eda6d1bc3a8c0452b70d289 (patch)
treea9412734afce83937aafb216d733a88075c2c0a1 /loader/loader.h
parent1665af28d4f7804475621b009d34bd698a814149 (diff)
downloadusermoji-159b7606b0784eb17eda6d1bc3a8c0452b70d289.tar.xz
wsi: Make WSI cases more consistent, fail if not set correctly
Filled in build details for Mir, Wayland, etc.
Diffstat (limited to 'loader/loader.h')
-rw-r--r--loader/loader.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/loader/loader.h b/loader/loader.h
index c6fc08d3..1c1dd2dc 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -205,7 +205,6 @@ struct loader_icd {
#endif
#ifdef VK_USE_PLATFORM_XCB_KHR
PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR GetPhysicalDeviceXcbPresentationSupportKHR;
- PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
#endif
#ifdef VK_USE_PLATFORM_XLIB_KHR
PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR GetPhysicalDeviceXlibPresentationSupportKHR;
@@ -246,14 +245,24 @@ struct loader_instance {
VkAllocationCallbacks alloc_callbacks;
bool wsi_surface_enabled;
-#ifdef _WIN32
+#ifdef VK_USE_PLATFORM_WIN32_KHR
bool wsi_win32_surface_enabled;
-#else // _WIN32
+#endif
+#ifdef VK_USE_PLATFORM_MIR_KHR
bool wsi_mir_surface_enabled;
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
bool wsi_wayland_surface_enabled;
+#endif
+#ifdef VK_USE_PLATFORM_XCB_KHR
bool wsi_xcb_surface_enabled;
+#endif
+#ifdef VK_USE_PLATFORM_XLIB_KHR
bool wsi_xlib_surface_enabled;
-#endif // _WIN32
+#endif
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+ bool wsi_android_surface_enabled;
+#endif
};
/* per enumerated PhysicalDevice structure */