diff options
| author | Ian Elliott <ianelliott@google.com> | 2015-11-19 11:58:08 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-01 10:18:23 -0700 |
| commit | e829740e8153eb9797ccd340d8caabbd29ed1bdd (patch) | |
| tree | f2f7addcf8772ea41c862b654b75e034201d7191 /loader | |
| parent | 30cbf3329555230655c7bc72b722b70e14966fc7 (diff) | |
| download | usermoji-e829740e8153eb9797ccd340d8caabbd29ed1bdd.tar.xz | |
loader: Create defaults for which platforms WSI is supported on.
Windows: VK_USE_PLATFORM_WIN32_KHR
Linux: VK_USE_PLATFORM_XCB_KHR
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/wsi.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/loader/wsi.c b/loader/wsi.c index db99fde2..b5848b4e 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -21,9 +21,26 @@ * DEALINGS IN THE SOFTWARE. * * Author: Ian Elliott <ian@lunarg.com> - * + * Author: Ian Elliott <ianelliott@google.com> */ +// FIXME/TODO: DEVELOP A BETTER APPROACH FOR SETTING THE DEFAULT VALUES FOR +// THESE PLATFORM-SPECIFIC MACROS APPROPRIATELY: +#ifdef _WIN32 +// The Win32 default is to support the WIN32 platform: +#ifndef VK_USE_PLATFORM_WIN32_KHR +#define VK_USE_PLATFORM_WIN32_KHR +#endif +#else // _WIN32 (i.e. Linux) +// The Linux default is to support the XCB platform: +#if (!defined(VK_USE_PLATFORM_MIR_KHR) && \ + !defined(VK_USE_PLATFORM_WAYLAND_KHR) && \ + !defined(VK_USE_PLATFORM_XCB_KHR) && \ + !defined(VK_USE_PLATFORM_XLIB_KHR)) +#define VK_USE_PLATFORM_XCB_KHR +#endif +#endif // _WIN32 + //#define _ISOC11_SOURCE /* for aligned_alloc() */ #define _GNU_SOURCE #include <stdlib.h> @@ -38,10 +55,12 @@ static const VkExtensionProperties wsi_surface_extension_info = { }; #ifdef _WIN32 +#ifdef VK_USE_PLATFORM_WIN32_KHR static const VkExtensionProperties wsi_win32_surface_extension_info = { .extensionName = VK_KHR_WIN32_SURFACE_EXTENSION_NAME, .specVersion = VK_KHR_WIN32_SURFACE_REVISION, }; +#endif/ VK_USE_PLATFORM_WIN32_KHR #else // _WIN32 #ifdef VK_USE_PLATFORM_MIR_KHR static const VkExtensionProperties wsi_mir_surface_extension_info = { @@ -78,7 +97,9 @@ void wsi_add_instance_extensions( { loader_add_to_ext_list(inst, ext_list, 1, &wsi_surface_extension_info); #ifdef _WIN32 +#ifdef VK_USE_PLATFORM_WIN32_KHR loader_add_to_ext_list(inst, ext_list, 1, &wsi_win32_surface_extension_info); +#endif/ VK_USE_PLATFORM_WIN32_KHR #else // _WIN32 #ifdef VK_USE_PLATFORM_MIR_KHR loader_add_to_ext_list(inst, ext_list, 1, &wsi_mir_surface_extension_info); @@ -113,30 +134,38 @@ void wsi_create_instance( for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_surface_enabled = true; + continue; } #ifdef _WIN32 +#ifdef VK_USE_PLATFORM_WIN32_KHR if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_WIN32_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_surface_enabled = true; + continue; } +#endif/ VK_USE_PLATFORM_WIN32_KHR #else // _WIN32 #ifdef VK_USE_PLATFORM_MIR_KHR if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_MIR_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_mir_surface_enabled = true; + continue; } #endif // VK_USE_PLATFORM_MIR_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_wayland_surface_enabled = true; + continue; } #endif // VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_XCB_KHR if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_XCB_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_xcb_surface_enabled = true; + continue; } #endif // VK_USE_PLATFORM_XCB_KHR #ifdef VK_USE_PLATFORM_XLIB_KHR if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_XLIB_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_xlib_surface_enabled = true; + continue; } #endif // VK_USE_PLATFORM_XLIB_KHR #endif // _WIN32 |