From e17c3219d34a90deb84a0eee9bbb1533791d2c08 Mon Sep 17 00:00:00 2001 From: Brandon Schaefer Date: Fri, 23 Feb 2018 11:24:26 -0500 Subject: [PATCH] mir: Disable Mir by default as Mir supports Wayland clients Also remove enabling VK support for Mir --- configure.in | 4 ++-- src/video/SDL_vulkan_internal.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 13ab2f5913ffa..1c7e79338a88e 100644 --- a/configure.in +++ b/configure.in @@ -1468,8 +1468,8 @@ dnl Check for Mir CheckMir() { AC_ARG_ENABLE(video-mir, -AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]), - ,enable_video_mir=yes) +AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=no]]]), + ,enable_video_mir=no) if test x$enable_video = xyes -a x$enable_video_mir = xyes; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/src/video/SDL_vulkan_internal.h b/src/video/SDL_vulkan_internal.h index cdf464ee09c3b..261fc9c057edd 100644 --- a/src/video/SDL_vulkan_internal.h +++ b/src/video/SDL_vulkan_internal.h @@ -38,9 +38,6 @@ #if SDL_VIDEO_DRIVER_COCOA #define VK_USE_PLATFORM_MACOS_MVK #endif -#if SDL_VIDEO_DRIVER_MIR -#define VK_USE_PLATFORM_MIR_KHR -#endif #if SDL_VIDEO_DRIVER_UIKIT #define VK_USE_PLATFORM_IOS_MVK #endif