diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-04-15 16:24:12 -0600 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-04-15 16:24:12 -0600 |
| commit | 0b8edb4903912878f4c104022cae7a9fe629f98a (patch) | |
| tree | 66bce7dcac8c71594e3da9d50133dc1f0baf3a54 /loader | |
| parent | 8c71f2e2790ff1e4bd6932cd2cad65f2314f6b3e (diff) | |
| download | usermoji-0b8edb4903912878f4c104022cae7a9fe629f98a.tar.xz | |
Revert "loader: temp workaround for advertising linux wsi surface extensions"
This reverts commit 23b248d32c943c136589e679e1fcc3444488d906.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/loader/loader.c b/loader/loader.c index 4d67646f..9b8be63c 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1147,36 +1147,15 @@ void loader_get_icd_loader_instance_extensions( // TODO REMOVE THIS, HACK ALERT // AMD driver doesn't advertise KHR_surface or KHR_win32_surface, add them - VkExtensionProperties props; - strcpy(props.extensionName, VK_KHR_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#ifdef VK_USE_PLATFORM_WIN32_KHR - strcpy(props.extensionName, VK_KHR_WIN32_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#endif -#ifdef VK_USE_PLATFORM_XCB_KHR - strcpy(props.extensionName, VK_KHR_XCB_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_XCB_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#endif -#ifdef VK_USE_PLATFORM_XLIB_KHR - strcpy(props.extensionName, VK_KHR_XLIB_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_XLIB_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#endif -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - strcpy(props.extensionName, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_WAYLAND_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#endif -#ifdef VK_USE_PLATFORM_MIR_KHR - strcpy(props.extensionName, VK_KHR_MIR_SURFACE_EXTENSION_NAME); - props.specVersion = VK_KHR_MIR_SURFACE_SPEC_VERSION; - loader_add_to_ext_list(inst, inst_exts, 1, &props); -#endif +#ifdef _WIN32 + VkExtensionProperties props[2]; + strcpy(props[0].extensionName, VK_KHR_SURFACE_EXTENSION_NAME); + props[0].specVersion = VK_KHR_SURFACE_SPEC_VERSION; + strcpy(props[1].extensionName, VK_KHR_WIN32_SURFACE_EXTENSION_NAME); + props[1].specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; + loader_add_to_ext_list(inst, inst_exts, 2, props); +#endif // Traverse loader's extensions, adding non-duplicate extensions to the list debug_report_add_instance_extensions(inst, inst_exts); } |