diff options
| author |  Jan Beich | 2020-04-19 00:30:24 +0000 |
|---|---|---|
| committer | Jan Beich | 2020-04-19 00:32:23 +0000 |
| commit | afcc84a1726556e08a560d03665fbc7b7c8f6b5f (patch) | |
| tree | d1a93c533ae4c35e7cdcb952fb36e8a6f8df1860 /src | |
| parent | Merge pull request #3716 from bunnei/fix-another-impl-fallthrough (diff) | |
| download | yuzu-afcc84a1726556e08a560d03665fbc7b7c8f6b5f.tar.gz yuzu-afcc84a1726556e08a560d03665fbc7b7c8f6b5f.tar.xz yuzu-afcc84a1726556e08a560d03665fbc7b7c8f6b5f.zip | |
renderer_vulkan: assume X11 if not Windows/macOS after bf1d66b7c074
Render.Vulkan <Error> video_core/renderer_vulkan/renderer_vulkan.cpp:CreateInstance:131: Presentation not supported on this platform
Render.Vulkan <Error> video_core/renderer_vulkan/renderer_vulkan.cpp:CreateSurface:378: Presentation not supported on this platform
Core <Critical> core/core.cpp:Load:199: Failed to initialize system (Error 5)!
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/renderer_vulkan.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index dd590c38b..04532f8f8 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <vulkan/vulkan_win32.h> | 42 | #include <vulkan/vulkan_win32.h> |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | #ifdef __linux__ | 45 | #if !defined(_WIN32) && !defined(__APPLE__) |
| 46 | #include <X11/Xlib.h> | 46 | #include <X11/Xlib.h> |
| 47 | #include <vulkan/vulkan_wayland.h> | 47 | #include <vulkan/vulkan_wayland.h> |
| 48 | #include <vulkan/vulkan_xlib.h> | 48 | #include <vulkan/vulkan_xlib.h> |
| @@ -119,7 +119,7 @@ vk::Instance CreateInstance(Common::DynamicLibrary& library, vk::InstanceDispatc | |||
| 119 | extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); | 119 | extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); |
| 120 | break; | 120 | break; |
| 121 | #endif | 121 | #endif |
| 122 | #ifdef __linux__ | 122 | #if !defined(_WIN32) && !defined(__APPLE__) |
| 123 | case Core::Frontend::WindowSystemType::X11: | 123 | case Core::Frontend::WindowSystemType::X11: |
| 124 | extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); | 124 | extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); |
| 125 | break; | 125 | break; |
| @@ -345,7 +345,7 @@ bool RendererVulkan::CreateSurface() { | |||
| 345 | } | 345 | } |
| 346 | } | 346 | } |
| 347 | #endif | 347 | #endif |
| 348 | #ifdef __linux__ | 348 | #if !defined(_WIN32) && !defined(__APPLE__) |
| 349 | if (window_info.type == Core::Frontend::WindowSystemType::X11) { | 349 | if (window_info.type == Core::Frontend::WindowSystemType::X11) { |
| 350 | const VkXlibSurfaceCreateInfoKHR xlib_ci{ | 350 | const VkXlibSurfaceCreateInfoKHR xlib_ci{ |
| 351 | VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, nullptr, 0, | 351 | VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, nullptr, 0, |