diff options
| author | Assiduous <61806567+TheMostDiligent@users.noreply.github.com> | 2020-06-09 19:26:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 19:26:23 +0000 |
| commit | 2fe8158aa6115da306883c765c6ec1270dc74037 (patch) | |
| tree | e8d314d311ed6107b27386d471cd5414b7a3aec2 /Graphics/GraphicsEngineVulkan | |
| parent | Enabled XLib support in Vulkan on Linux (fixed https://github.com/DiligentGra... (diff) | |
| parent | Fix for XLib support for Linux (diff) | |
| download | DiligentCore-2fe8158aa6115da306883c765c6ec1270dc74037.tar.gz DiligentCore-2fe8158aa6115da306883c765c6ec1270dc74037.zip | |
Merge pull request #147 from speedym/master
Fix for XLib / Vulkan support for Linux
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp index fe489efd..0ba9dfc4 100644 --- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp +++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp @@ -118,17 +118,25 @@ VulkanInstance::VulkanInstance(bool EnableValidation, // Enable surface extensions depending on OS #if defined(VK_USE_PLATFORM_WIN32_KHR) - VK_KHR_WIN32_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_ANDROID_KHR) - VK_KHR_ANDROID_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_WAYLAND_KHR) - VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_XCB_KHR) - VK_KHR_XCB_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_IOS_MVK) - VK_MVK_IOS_SURFACE_EXTENSION_NAME -#elif defined(VK_USE_PLATFORM_MACOS_MVK) - VK_MVK_MACOS_SURFACE_EXTENSION_NAME + VK_KHR_WIN32_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_ANDROID_KHR) + VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_WAYLAND_KHR) + VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_XLIB_KHR) + VK_KHR_XLIB_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_XCB_KHR) + VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_IOS_MVK) + VK_MVK_IOS_SURFACE_EXTENSION_NAME, +#endif +#if defined(VK_USE_PLATFORM_MACOS_MVK) + VK_MVK_MACOS_SURFACE_EXTENSION_NAME, #endif }; |