Be clear that disabling Vulkan surface support disables the entire SDL Vulkan integration
authorSam Lantinga <slouken@libsdl.org>
Mon, 28 Aug 2017 00:11:38 -0700
changeset 113812610f8f0a9c6
parent 11380 bb5404c6b2e0
child 11382 2c50e79b19e0
Be clear that disabling Vulkan surface support disables the entire SDL Vulkan integration
CMakeLists.txt
configure
configure.in
docs/README-windows.md
include/SDL_config.h.cmake
include/SDL_config.h.in
include/SDL_config_android.h
include/SDL_config_iphoneos.h
include/SDL_config_macosx.h
include/SDL_config_windows.h
src/video/SDL_vulkan_internal.h
src/video/SDL_vulkan_utils.c
src/video/android/SDL_androidvideo.c
src/video/android/SDL_androidvulkan.c
src/video/android/SDL_androidvulkan.h
src/video/cocoa/SDL_cocoavideo.m
src/video/cocoa/SDL_cocoavulkan.h
src/video/cocoa/SDL_cocoavulkan.m
src/video/mir/SDL_mirvideo.c
src/video/mir/SDL_mirvulkan.c
src/video/mir/SDL_mirvulkan.h
src/video/uikit/SDL_uikitmetalview.m
src/video/uikit/SDL_uikitvideo.m
src/video/uikit/SDL_uikitvulkan.h
src/video/uikit/SDL_uikitvulkan.m
src/video/wayland/SDL_waylandvideo.c
src/video/wayland/SDL_waylandvulkan.c
src/video/wayland/SDL_waylandvulkan.h
src/video/windows/SDL_windowsvideo.c
src/video/windows/SDL_windowsvulkan.c
src/video/windows/SDL_windowsvulkan.h
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11vulkan.c
src/video/x11/SDL_x11vulkan.h
     1.1 --- a/CMakeLists.txt	Sun Aug 27 23:53:09 2017 -0700
     1.2 +++ b/CMakeLists.txt	Mon Aug 28 00:11:38 2017 -0700
     1.3 @@ -325,7 +325,7 @@
     1.4  set_option(DIRECTX             "Use DirectX for Windows audio/video" ${WINDOWS})
     1.5  set_option(RENDER_D3D          "Enable the Direct3D render driver" ${WINDOWS})
     1.6  set_option(VIDEO_VIVANTE       "Use Vivante EGL video driver" ${UNIX_SYS})
     1.7 -dep_option(VIDEO_VULKAN        "Enable Vulkan surface creation" ON "ANDROID OR APPLE OR LINUX OR WINDOWS" OFF)
     1.8 +dep_option(VIDEO_VULKAN        "Enable Vulkan support" ON "ANDROID OR APPLE OR LINUX OR WINDOWS" OFF)
     1.9  set_option(VIDEO_KMSDRM        "Use KMS DRM video driver" ${UNIX_SYS})
    1.10  dep_option(KMSDRM_SHARED       "Dynamically load KMS DRM support" ON "VIDEO_KMSDRM" OFF)
    1.11  
    1.12 @@ -1518,7 +1518,7 @@
    1.13  endif()
    1.14  
    1.15  if(VIDEO_VULKAN AND (NOT APPLE OR QUARTZCORE))
    1.16 -  set(SDL_VIDEO_VULKAN_SURFACE 1)
    1.17 +  set(SDL_VIDEO_VULKAN 1)
    1.18  endif()
    1.19  
    1.20  # Dummies
     2.1 --- a/configure	Sun Aug 27 23:53:09 2017 -0700
     2.2 +++ b/configure	Mon Aug 28 00:11:38 2017 -0700
     2.3 @@ -21957,7 +21957,7 @@
     2.4      fi
     2.5      if test x$enable_video_vulkan = xyes; then
     2.6  
     2.7 -$as_echo "#define SDL_VIDEO_VULKAN_SURFACE 1" >>confdefs.h
     2.8 +$as_echo "#define SDL_VIDEO_VULKAN 1" >>confdefs.h
     2.9  
    2.10          SUMMARY_video="${SUMMARY_video} vulkan"
    2.11      fi
     3.1 --- a/configure.in	Sun Aug 27 23:53:09 2017 -0700
     3.2 +++ b/configure.in	Mon Aug 28 00:11:38 2017 -0700
     3.3 @@ -2403,7 +2403,7 @@
     3.4  
     3.5  dnl Check to see if Vulkan surface support is desired
     3.6  AC_ARG_ENABLE(video-vulkan,
     3.7 -AC_HELP_STRING([--enable-video-vulkan], [include Vulkan surface support [[default=yes]]]),
     3.8 +AC_HELP_STRING([--enable-video-vulkan], [include Vulkan support [[default=yes]]]),
     3.9                , enable_video_vulkan=yes)
    3.10  
    3.11  dnl Find Vulkan Header
    3.12 @@ -2435,7 +2435,7 @@
    3.13          fi
    3.14      fi
    3.15      if test x$enable_video_vulkan = xyes; then
    3.16 -        AC_DEFINE(SDL_VIDEO_VULKAN_SURFACE, 1, [ ])
    3.17 +        AC_DEFINE(SDL_VIDEO_VULKAN, 1, [ ])
    3.18          SUMMARY_video="${SUMMARY_video} vulkan"
    3.19      fi
    3.20  }
     4.1 --- a/docs/README-windows.md	Sun Aug 27 23:53:09 2017 -0700
     4.2 +++ b/docs/README-windows.md	Mon Aug 28 00:11:38 2017 -0700
     4.3 @@ -42,4 +42,4 @@
     4.4  Vulkan Surface Support
     4.5  ==============
     4.6  
     4.7 -Support for creating Vulkan surfaces is configured on by default. To disable it change the value of `SDL_VIDEO_VULKAN_SURFACE` to 0 in `SDL_config_windows`. When it is on you must install a  [Vulkan SDK](https://www.lunarg.com/vulkan-sdk/) in order to build libSDL.
     4.8 +Support for creating Vulkan surfaces is configured on by default. To disable it change the value of `SDL_VIDEO_VULKAN` to 0 in `SDL_config_windows.h`. You must install the [Vulkan SDK](https://www.lunarg.com/vulkan-sdk/) in order to use Vulkan graphics in your application.
     5.1 --- a/include/SDL_config.h.cmake	Sun Aug 27 23:53:09 2017 -0700
     5.2 +++ b/include/SDL_config.h.cmake	Mon Aug 28 00:11:38 2017 -0700
     5.3 @@ -354,8 +354,8 @@
     5.4  #cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
     5.5  #cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@
     5.6  
     5.7 -/* Enable Vulkan surface support */
     5.8 -#cmakedefine SDL_VIDEO_VULKAN_SURFACE @SDL_VIDEO_VULKAN_SURFACE@
     5.9 +/* Enable Vulkan support */
    5.10 +#cmakedefine SDL_VIDEO_VULKAN @SDL_VIDEO_VULKAN@
    5.11  
    5.12  /* Enable system power support */
    5.13  #cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@
     6.1 --- a/include/SDL_config.h.in	Sun Aug 27 23:53:09 2017 -0700
     6.2 +++ b/include/SDL_config.h.in	Mon Aug 28 00:11:38 2017 -0700
     6.3 @@ -351,8 +351,8 @@
     6.4  #undef SDL_VIDEO_OPENGL_OSMESA
     6.5  #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
     6.6  
     6.7 -/* Enable Vulkan surface support */
     6.8 -#undef SDL_VIDEO_VULKAN_SURFACE
     6.9 +/* Enable Vulkan support */
    6.10 +#undef SDL_VIDEO_VULKAN
    6.11  
    6.12  /* Enable system power support */
    6.13  #undef SDL_POWER_LINUX
     7.1 --- a/include/SDL_config_android.h	Sun Aug 27 23:53:09 2017 -0700
     7.2 +++ b/include/SDL_config_android.h	Mon Aug 28 00:11:38 2017 -0700
     7.3 @@ -140,12 +140,12 @@
     7.4  #define SDL_VIDEO_RENDER_OGL_ES 1
     7.5  #define SDL_VIDEO_RENDER_OGL_ES2    1
     7.6  
     7.7 -/* Enable Vulkan surface support */
     7.8 +/* Enable Vulkan support */
     7.9  /* Android does not support Vulkan in native code using the "armeabi" ABI. */
    7.10 -#if !defined(__ARM_EABI__) || defined(__ARM_ARCH_7A__)
    7.11 -#define SDL_VIDEO_VULKAN_SURFACE 1
    7.12 +#if defined(__ARM_ARCH) && __ARM_ARCH < 7
    7.13 +#define SDL_VIDEO_VULKAN 0
    7.14  #else
    7.15 -#define SDL_VIDEO_VULKAN_SURFACE 0
    7.16 +#define SDL_VIDEO_VULKAN 1
    7.17  #endif
    7.18  
    7.19  /* Enable system power support */
     8.1 --- a/include/SDL_config_iphoneos.h	Sun Aug 27 23:53:09 2017 -0700
     8.2 +++ b/include/SDL_config_iphoneos.h	Mon Aug 28 00:11:38 2017 -0700
     8.3 @@ -139,11 +139,11 @@
     8.4  #define SDL_VIDEO_RENDER_OGL_ES 1
     8.5  #define SDL_VIDEO_RENDER_OGL_ES2    1
     8.6  
     8.7 -/* Enable Vulkan surface support */
     8.8 +/* Enable Vulkan support */
     8.9  #if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM // Only 64-bit devices have Metal
    8.10 -#define SDL_VIDEO_VULKAN_SURFACE 1
    8.11 +#define SDL_VIDEO_VULKAN 1
    8.12  #else
    8.13 -#define SDL_VIDEO_VULKAN_SURFACE 0
    8.14 +#define SDL_VIDEO_VULKAN 0
    8.15  #endif
    8.16  
    8.17  /* Enable system power support */
     9.1 --- a/include/SDL_config_macosx.h	Sun Aug 27 23:53:09 2017 -0700
     9.2 +++ b/include/SDL_config_macosx.h	Mon Aug 28 00:11:38 2017 -0700
     9.3 @@ -174,12 +174,12 @@
     9.4  #define SDL_VIDEO_OPENGL_GLX    1
     9.5  #endif
     9.6  
     9.7 -/* enable Vulkan surface support */
     9.8 +/* Enable Vulkan support */
     9.9 +/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures */
    9.10  #if TARGET_CPU_X86_64
    9.11 -/* Metal/MoltenVK/Vulkan not supported on 32-bit architectures. */
    9.12 -#define SDL_VIDEO_VULKAN_SURFACE 1
    9.13 +#define SDL_VIDEO_VULKAN 1
    9.14  #else
    9.15 -#define  SDL_VIDEO_VULKAN_SURFACE 0
    9.16 +#define  SDL_VIDEO_VULKAN 0
    9.17  #endif
    9.18  
    9.19  /* Enable system power support */
    10.1 --- a/include/SDL_config_windows.h	Sun Aug 27 23:53:09 2017 -0700
    10.2 +++ b/include/SDL_config_windows.h	Mon Aug 28 00:11:38 2017 -0700
    10.3 @@ -208,7 +208,8 @@
    10.4  #define SDL_VIDEO_OPENGL_EGL    1
    10.5  #endif
    10.6  
    10.7 -#define SDL_VIDEO_VULKAN_SURFACE 1
    10.8 +/* Enable Vulkan support */
    10.9 +#define SDL_VIDEO_VULKAN 1
   10.10  
   10.11  /* Enable system power support */
   10.12  #define SDL_POWER_WINDOWS 1
    11.1 --- a/src/video/SDL_vulkan_internal.h	Sun Aug 27 23:53:09 2017 -0700
    11.2 +++ b/src/video/SDL_vulkan_internal.h	Mon Aug 28 00:11:38 2017 -0700
    11.3 @@ -25,18 +25,12 @@
    11.4  
    11.5  #include "SDL_stdinc.h"
    11.6  
    11.7 -#if defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
    11.8 -/* Vulkan isn't supported for the 'armeabi' NDK ABI, error in vk_platform.h */
    11.9 -#undef SDL_VIDEO_VULKAN_SURFACE
   11.10 -#define SDL_VIDEO_VULKAN_SURFACE 0
   11.11 +#if defined(SDL_LOADSO_DISABLED)
   11.12 +#undef SDL_VIDEO_VULKAN
   11.13 +#define SDL_VIDEO_VULKAN 0
   11.14  #endif
   11.15  
   11.16 -#if defined(SDL_LOADSO_DISABLED)
   11.17 -#undef SDL_VIDEO_VULKAN_SURFACE
   11.18 -#define SDL_VIDEO_VULKAN_SURFACE 0
   11.19 -#endif
   11.20 -
   11.21 -#if SDL_VIDEO_VULKAN_SURFACE
   11.22 +#if SDL_VIDEO_VULKAN
   11.23  
   11.24  #if SDL_VIDEO_DRIVER_ANDROID
   11.25  #define VK_USE_PLATFORM_ANDROID_KHR
   11.26 @@ -85,7 +79,7 @@
   11.27  /* No SDL Vulkan support, just include the header for typedefs */
   11.28  #include "SDL_vulkan.h"
   11.29  
   11.30 -#endif /* SDL_VIDEO_VULKAN_SURFACE */
   11.31 +#endif /* SDL_VIDEO_VULKAN */
   11.32  
   11.33  #endif /* SDL_vulkan_internal_h_ */
   11.34  
    12.1 --- a/src/video/SDL_vulkan_utils.c	Sun Aug 27 23:53:09 2017 -0700
    12.2 +++ b/src/video/SDL_vulkan_utils.c	Mon Aug 28 00:11:38 2017 -0700
    12.3 @@ -23,7 +23,7 @@
    12.4  #include "SDL_vulkan_internal.h"
    12.5  #include "SDL_error.h"
    12.6  
    12.7 -#if SDL_VIDEO_VULKAN_SURFACE
    12.8 +#if SDL_VIDEO_VULKAN
    12.9  
   12.10  /* Based on the headers found in
   12.11   * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
    13.1 --- a/src/video/android/SDL_androidvideo.c	Sun Aug 27 23:53:09 2017 -0700
    13.2 +++ b/src/video/android/SDL_androidvideo.c	Mon Aug 28 00:11:38 2017 -0700
    13.3 @@ -133,7 +133,7 @@
    13.4      device->GL_SwapWindow = Android_GLES_SwapWindow;
    13.5      device->GL_DeleteContext = Android_GLES_DeleteContext;
    13.6  
    13.7 -#if SDL_VIDEO_VULKAN_SURFACE
    13.8 +#if SDL_VIDEO_VULKAN
    13.9      device->Vulkan_LoadLibrary = Android_Vulkan_LoadLibrary;
   13.10      device->Vulkan_UnloadLibrary = Android_Vulkan_UnloadLibrary;
   13.11      device->Vulkan_GetInstanceExtensions = Android_Vulkan_GetInstanceExtensions;
    14.1 --- a/src/video/android/SDL_androidvulkan.c	Sun Aug 27 23:53:09 2017 -0700
    14.2 +++ b/src/video/android/SDL_androidvulkan.c	Mon Aug 28 00:11:38 2017 -0700
    14.3 @@ -26,7 +26,7 @@
    14.4  
    14.5  #include "../../SDL_internal.h"
    14.6  
    14.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_ANDROID
    14.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_ANDROID
    14.9  
   14.10  #include "SDL_androidvideo.h"
   14.11  #include "SDL_androidwindow.h"
    15.1 --- a/src/video/android/SDL_androidvulkan.h	Sun Aug 27 23:53:09 2017 -0700
    15.2 +++ b/src/video/android/SDL_androidvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    15.3 @@ -32,7 +32,7 @@
    15.4  #include "../SDL_vulkan_internal.h"
    15.5  #include "../SDL_sysvideo.h"
    15.6  
    15.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_ANDROID
    15.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_ANDROID
    15.9  
   15.10  int Android_Vulkan_LoadLibrary(_THIS, const char *path);
   15.11  void Android_Vulkan_UnloadLibrary(_THIS);
    16.1 --- a/src/video/cocoa/SDL_cocoavideo.m	Sun Aug 27 23:53:09 2017 -0700
    16.2 +++ b/src/video/cocoa/SDL_cocoavideo.m	Mon Aug 28 00:11:38 2017 -0700
    16.3 @@ -123,7 +123,7 @@
    16.4      device->GL_DeleteContext = Cocoa_GL_DeleteContext;
    16.5  #endif
    16.6  
    16.7 -#if SDL_VIDEO_VULKAN_SURFACE
    16.8 +#if SDL_VIDEO_VULKAN
    16.9      device->Vulkan_LoadLibrary = Cocoa_Vulkan_LoadLibrary;
   16.10      device->Vulkan_UnloadLibrary = Cocoa_Vulkan_UnloadLibrary;
   16.11      device->Vulkan_GetInstanceExtensions = Cocoa_Vulkan_GetInstanceExtensions;
    17.1 --- a/src/video/cocoa/SDL_cocoavulkan.h	Sun Aug 27 23:53:09 2017 -0700
    17.2 +++ b/src/video/cocoa/SDL_cocoavulkan.h	Mon Aug 28 00:11:38 2017 -0700
    17.3 @@ -33,7 +33,7 @@
    17.4  #include "../SDL_vulkan_internal.h"
    17.5  #include "../SDL_sysvideo.h"
    17.6  
    17.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_COCOA
    17.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA
    17.9  
   17.10  int Cocoa_Vulkan_LoadLibrary(_THIS, const char *path);
   17.11  void Cocoa_Vulkan_UnloadLibrary(_THIS);
    18.1 --- a/src/video/cocoa/SDL_cocoavulkan.m	Sun Aug 27 23:53:09 2017 -0700
    18.2 +++ b/src/video/cocoa/SDL_cocoavulkan.m	Mon Aug 28 00:11:38 2017 -0700
    18.3 @@ -26,7 +26,7 @@
    18.4  
    18.5  #include "../../SDL_internal.h"
    18.6  
    18.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_COCOA
    18.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA
    18.9  
   18.10  #include "SDL_cocoavideo.h"
   18.11  #include "SDL_cocoawindow.h"
    19.1 --- a/src/video/mir/SDL_mirvideo.c	Sun Aug 27 23:53:09 2017 -0700
    19.2 +++ b/src/video/mir/SDL_mirvideo.c	Mon Aug 28 00:11:38 2017 -0700
    19.3 @@ -233,7 +233,7 @@
    19.4  
    19.5      device->ShowMessageBox = NULL;
    19.6  
    19.7 -#if SDL_VIDEO_VULKAN_SURFACE
    19.8 +#if SDL_VIDEO_VULKAN
    19.9      device->Vulkan_LoadLibrary = MIR_Vulkan_LoadLibrary;
   19.10      device->Vulkan_UnloadLibrary = MIR_Vulkan_UnloadLibrary;
   19.11      device->Vulkan_GetInstanceExtensions = MIR_Vulkan_GetInstanceExtensions;
    20.1 --- a/src/video/mir/SDL_mirvulkan.c	Sun Aug 27 23:53:09 2017 -0700
    20.2 +++ b/src/video/mir/SDL_mirvulkan.c	Mon Aug 28 00:11:38 2017 -0700
    20.3 @@ -26,7 +26,7 @@
    20.4  
    20.5  #include "../../SDL_internal.h"
    20.6  
    20.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_MIR
    20.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_MIR
    20.9  
   20.10  #include "SDL_mirvideo.h"
   20.11  #include "SDL_mirwindow.h"
    21.1 --- a/src/video/mir/SDL_mirvulkan.h	Sun Aug 27 23:53:09 2017 -0700
    21.2 +++ b/src/video/mir/SDL_mirvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    21.3 @@ -32,7 +32,7 @@
    21.4  #include "../SDL_vulkan_internal.h"
    21.5  #include "../SDL_sysvideo.h"
    21.6  
    21.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_MIR
    21.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_MIR
    21.9  
   21.10  int MIR_Vulkan_LoadLibrary(_THIS, const char *path);
   21.11  void MIR_Vulkan_UnloadLibrary(_THIS);
    22.1 --- a/src/video/uikit/SDL_uikitmetalview.m	Sun Aug 27 23:53:09 2017 -0700
    22.2 +++ b/src/video/uikit/SDL_uikitmetalview.m	Mon Aug 28 00:11:38 2017 -0700
    22.3 @@ -28,7 +28,7 @@
    22.4  
    22.5  #include "../../SDL_internal.h"
    22.6  
    22.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_UIKIT
    22.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_UIKIT
    22.9  
   22.10  #import "../SDL_sysvideo.h"
   22.11  #import "SDL_uikitwindow.h"
    23.1 --- a/src/video/uikit/SDL_uikitvideo.m	Sun Aug 27 23:53:09 2017 -0700
    23.2 +++ b/src/video/uikit/SDL_uikitvideo.m	Mon Aug 28 00:11:38 2017 -0700
    23.3 @@ -102,13 +102,13 @@
    23.4          device->GetWindowWMInfo = UIKit_GetWindowWMInfo;
    23.5          device->GetDisplayUsableBounds = UIKit_GetDisplayUsableBounds;
    23.6  
    23.7 -    #if SDL_IPHONE_KEYBOARD
    23.8 +#if SDL_IPHONE_KEYBOARD
    23.9          device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
   23.10          device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
   23.11          device->HideScreenKeyboard = UIKit_HideScreenKeyboard;
   23.12          device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
   23.13          device->SetTextInputRect = UIKit_SetTextInputRect;
   23.14 -    #endif
   23.15 +#endif
   23.16  
   23.17          device->SetClipboardText = UIKit_SetClipboardText;
   23.18          device->GetClipboardText = UIKit_GetClipboardText;
   23.19 @@ -124,14 +124,14 @@
   23.20          device->GL_LoadLibrary      = UIKit_GL_LoadLibrary;
   23.21          device->free = UIKit_DeleteDevice;
   23.22  
   23.23 -    #if SDL_VIDEO_VULKAN_SURFACE
   23.24 +#if SDL_VIDEO_VULKAN
   23.25          device->Vulkan_LoadLibrary = UIKit_Vulkan_LoadLibrary;
   23.26          device->Vulkan_UnloadLibrary = UIKit_Vulkan_UnloadLibrary;
   23.27          device->Vulkan_GetInstanceExtensions
   23.28                                       = UIKit_Vulkan_GetInstanceExtensions;
   23.29          device->Vulkan_CreateSurface = UIKit_Vulkan_CreateSurface;
   23.30          device->Vulkan_GetDrawableSize = UIKit_Vulkan_GetDrawableSize;
   23.31 -    #endif
   23.32 +#endif
   23.33  
   23.34          device->gl_config.accelerated = 1;
   23.35  
    24.1 --- a/src/video/uikit/SDL_uikitvulkan.h	Sun Aug 27 23:53:09 2017 -0700
    24.2 +++ b/src/video/uikit/SDL_uikitvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    24.3 @@ -32,7 +32,7 @@
    24.4  #include "../SDL_vulkan_internal.h"
    24.5  #include "../SDL_sysvideo.h"
    24.6  
    24.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_UIKIT
    24.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_UIKIT
    24.9  
   24.10  int UIKit_Vulkan_LoadLibrary(_THIS, const char *path);
   24.11  void UIKit_Vulkan_UnloadLibrary(_THIS);
    25.1 --- a/src/video/uikit/SDL_uikitvulkan.m	Sun Aug 27 23:53:09 2017 -0700
    25.2 +++ b/src/video/uikit/SDL_uikitvulkan.m	Mon Aug 28 00:11:38 2017 -0700
    25.3 @@ -26,7 +26,7 @@
    25.4  
    25.5  #include "../../SDL_internal.h"
    25.6  
    25.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_UIKIT
    25.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_UIKIT
    25.9  
   25.10  #include "SDL_uikitvideo.h"
   25.11  #include "SDL_uikitwindow.h"
    26.1 --- a/src/video/wayland/SDL_waylandvideo.c	Sun Aug 27 23:53:09 2017 -0700
    26.2 +++ b/src/video/wayland/SDL_waylandvideo.c	Mon Aug 28 00:11:38 2017 -0700
    26.3 @@ -182,7 +182,7 @@
    26.4      device->GetClipboardText = Wayland_GetClipboardText;
    26.5      device->HasClipboardText = Wayland_HasClipboardText;
    26.6  
    26.7 -#if SDL_VIDEO_VULKAN_SURFACE
    26.8 +#if SDL_VIDEO_VULKAN
    26.9      device->Vulkan_LoadLibrary = Wayland_Vulkan_LoadLibrary;
   26.10      device->Vulkan_UnloadLibrary = Wayland_Vulkan_UnloadLibrary;
   26.11      device->Vulkan_GetInstanceExtensions = Wayland_Vulkan_GetInstanceExtensions;
    27.1 --- a/src/video/wayland/SDL_waylandvulkan.c	Sun Aug 27 23:53:09 2017 -0700
    27.2 +++ b/src/video/wayland/SDL_waylandvulkan.c	Mon Aug 28 00:11:38 2017 -0700
    27.3 @@ -26,7 +26,7 @@
    27.4  
    27.5  #include "../../SDL_internal.h"
    27.6  
    27.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_WAYLAND
    27.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_WAYLAND
    27.9  
   27.10  #include "SDL_waylandvideo.h"
   27.11  #include "SDL_waylandwindow.h"
    28.1 --- a/src/video/wayland/SDL_waylandvulkan.h	Sun Aug 27 23:53:09 2017 -0700
    28.2 +++ b/src/video/wayland/SDL_waylandvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    28.3 @@ -32,7 +32,7 @@
    28.4  #include "../SDL_vulkan_internal.h"
    28.5  #include "../SDL_sysvideo.h"
    28.6  
    28.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_WAYLAND
    28.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_WAYLAND
    28.9  
   28.10  int Wayland_Vulkan_LoadLibrary(_THIS, const char *path);
   28.11  void Wayland_Vulkan_UnloadLibrary(_THIS);
    29.1 --- a/src/video/windows/SDL_windowsvideo.c	Sun Aug 27 23:53:09 2017 -0700
    29.2 +++ b/src/video/windows/SDL_windowsvideo.c	Mon Aug 28 00:11:38 2017 -0700
    29.3 @@ -191,7 +191,7 @@
    29.4      device->GL_SwapWindow = WIN_GLES_SwapWindow;
    29.5      device->GL_DeleteContext = WIN_GLES_DeleteContext;
    29.6  #endif
    29.7 -#if SDL_VIDEO_VULKAN_SURFACE
    29.8 +#if SDL_VIDEO_VULKAN
    29.9      device->Vulkan_LoadLibrary = WIN_Vulkan_LoadLibrary;
   29.10      device->Vulkan_UnloadLibrary = WIN_Vulkan_UnloadLibrary;
   29.11      device->Vulkan_GetInstanceExtensions = WIN_Vulkan_GetInstanceExtensions;
    30.1 --- a/src/video/windows/SDL_windowsvulkan.c	Sun Aug 27 23:53:09 2017 -0700
    30.2 +++ b/src/video/windows/SDL_windowsvulkan.c	Mon Aug 28 00:11:38 2017 -0700
    30.3 @@ -26,7 +26,7 @@
    30.4  
    30.5  #include "../../SDL_internal.h"
    30.6  
    30.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_WINDOWS
    30.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_WINDOWS
    30.9  
   30.10  #include "SDL_windowsvideo.h"
   30.11  #include "SDL_windowswindow.h"
    31.1 --- a/src/video/windows/SDL_windowsvulkan.h	Sun Aug 27 23:53:09 2017 -0700
    31.2 +++ b/src/video/windows/SDL_windowsvulkan.h	Mon Aug 28 00:11:38 2017 -0700
    31.3 @@ -32,7 +32,7 @@
    31.4  #include "../SDL_vulkan_internal.h"
    31.5  #include "../SDL_sysvideo.h"
    31.6  
    31.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_WINDOWS
    31.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_WINDOWS
    31.9  
   31.10  int WIN_Vulkan_LoadLibrary(_THIS, const char *path);
   31.11  void WIN_Vulkan_UnloadLibrary(_THIS);
    32.1 --- a/src/video/x11/SDL_x11video.c	Sun Aug 27 23:53:09 2017 -0700
    32.2 +++ b/src/video/x11/SDL_x11video.c	Mon Aug 28 00:11:38 2017 -0700
    32.3 @@ -296,7 +296,7 @@
    32.4  
    32.5      device->free = X11_DeleteDevice;
    32.6  
    32.7 -#if SDL_VIDEO_VULKAN_SURFACE
    32.8 +#if SDL_VIDEO_VULKAN
    32.9      device->Vulkan_LoadLibrary = X11_Vulkan_LoadLibrary;
   32.10      device->Vulkan_UnloadLibrary = X11_Vulkan_UnloadLibrary;
   32.11      device->Vulkan_GetInstanceExtensions = X11_Vulkan_GetInstanceExtensions;
    33.1 --- a/src/video/x11/SDL_x11video.h	Sun Aug 27 23:53:09 2017 -0700
    33.2 +++ b/src/video/x11/SDL_x11video.h	Mon Aug 28 00:11:38 2017 -0700
    33.3 @@ -141,7 +141,7 @@
    33.4      KeyCode filter_code;
    33.5      Time    filter_time;
    33.6  
    33.7 -#if SDL_VIDEO_VULKAN_SURFACE
    33.8 +#if SDL_VIDEO_VULKAN
    33.9      /* Vulkan variables only valid if _this->vulkan_config.loader_handle is not NULL */
   33.10      void *vulkan_xlib_xcb_library;
   33.11      PFN_XGetXCBConnection vulkan_XGetXCBConnection;
    34.1 --- a/src/video/x11/SDL_x11vulkan.c	Sun Aug 27 23:53:09 2017 -0700
    34.2 +++ b/src/video/x11/SDL_x11vulkan.c	Mon Aug 28 00:11:38 2017 -0700
    34.3 @@ -20,7 +20,7 @@
    34.4  */
    34.5  #include "../../SDL_internal.h"
    34.6  
    34.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_X11
    34.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_X11
    34.9  
   34.10  #include "SDL_x11video.h"
   34.11  #include "SDL_assert.h"
    35.1 --- a/src/video/x11/SDL_x11vulkan.h	Sun Aug 27 23:53:09 2017 -0700
    35.2 +++ b/src/video/x11/SDL_x11vulkan.h	Mon Aug 28 00:11:38 2017 -0700
    35.3 @@ -25,7 +25,7 @@
    35.4  
    35.5  #include "../SDL_vulkan_internal.h"
    35.6  
    35.7 -#if SDL_VIDEO_VULKAN_SURFACE && SDL_VIDEO_DRIVER_X11
    35.8 +#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_X11
    35.9  
   35.10  typedef struct xcb_connection_t xcb_connection_t;
   35.11  typedef xcb_connection_t *(*PFN_XGetXCBConnection)(Display *dpy);