summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-19 07:20:59 +0200
committerGitHub <noreply@github.com>2020-04-19 07:20:59 +0200
commit9c85f385b19723275ee0f7723171cf2499de9906 (patch)
treeebd75d75fd919c7187b426b1240ddba8d3ff8883
parentMerge pull request #3719 from jbeich/clang (diff)
parentrenderer_vulkan: assume X11 if not Windows/macOS after bf1d66b7c074 (diff)
downloadyuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar.gz
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar.bz2
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar.lz
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar.xz
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.tar.zst
yuzu-9c85f385b19723275ee0f7723171cf2499de9906.zip
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.cpp6
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 @@
#include <vulkan/vulkan_win32.h>
#endif
-#ifdef __linux__
+#if !defined(_WIN32) && !defined(__APPLE__)
#include <X11/Xlib.h>
#include <vulkan/vulkan_wayland.h>
#include <vulkan/vulkan_xlib.h>
@@ -119,7 +119,7 @@ vk::Instance CreateInstance(Common::DynamicLibrary& library, vk::InstanceDispatc
extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
break;
#endif
-#ifdef __linux__
+#if !defined(_WIN32) && !defined(__APPLE__)
case Core::Frontend::WindowSystemType::X11:
extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
break;
@@ -345,7 +345,7 @@ bool RendererVulkan::CreateSurface() {
}
}
#endif
-#ifdef __linux__
+#if !defined(_WIN32) && !defined(__APPLE__)
if (window_info.type == Core::Frontend::WindowSystemType::X11) {
const VkXlibSurfaceCreateInfoKHR xlib_ci{
VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, nullptr, 0,