eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be clear that disabling Vulkan surface support disables the entire SDL Vulkan integration

Browse source
This commit is contained in:
Sam Lantinga 2017-08-28 00:11:38 -07:00
parent 5cd1a95910
commit ce2b16445e
35 changed files with 54 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/SDL_config.h.cmake
View file

@ -354,8 +354,8 @@
#cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
#cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@
/* Enable Vulkan surface support */
#cmakedefine SDL_VIDEO_VULKAN_SURFACE @SDL_VIDEO_VULKAN_SURFACE@
/* Enable Vulkan support */
#cmakedefine SDL_VIDEO_VULKAN @SDL_VIDEO_VULKAN@
/* Enable system power support */
#cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@

4
include/SDL_config.h.in
View file

@ -351,8 +351,8 @@
#undef SDL_VIDEO_OPENGL_OSMESA
#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
/* Enable Vulkan surface support */
#undef SDL_VIDEO_VULKAN_SURFACE
/* Enable Vulkan support */
#undef SDL_VIDEO_VULKAN
/* Enable system power support */
#undef SDL_POWER_LINUX

8
include/SDL_config_android.h
View file

@ -140,12 +140,12 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_RENDER_OGL_ES2 1
/* Enable Vulkan surface support */
/* Enable Vulkan support */
/* Android does not support Vulkan in native code using the "armeabi" ABI. */
#if !defined(__ARM_EABI__) || defined(__ARM_ARCH_7A__)
#define SDL_VIDEO_VULKAN_SURFACE 1
#if defined(__ARM_ARCH) && __ARM_ARCH < 7
#define SDL_VIDEO_VULKAN 0
#else
#define SDL_VIDEO_VULKAN_SURFACE 0
#define SDL_VIDEO_VULKAN 1
#endif
/* Enable system power support */

6
include/SDL_config_iphoneos.h
View file

@ -139,11 +139,11 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_RENDER_OGL_ES2 1
/* Enable Vulkan surface support */
/* Enable Vulkan support */
#if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM // Only 64-bit devices have Metal
#define SDL_VIDEO_VULKAN_SURFACE 1
#define SDL_VIDEO_VULKAN 1
#else
#define SDL_VIDEO_VULKAN_SURFACE 0
#define SDL_VIDEO_VULKAN 0
#endif
/* Enable system power support */

8
include/SDL_config_macosx.h
View file

@ -174,12 +174,12 @@
#define SDL_VIDEO_OPENGL_GLX 1
#endif
/* enable Vulkan surface support */
/* Enable Vulkan support */
/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures */
#if TARGET_CPU_X86_64
/* Metal/MoltenVK/Vulkan not supported on 32-bit architectures. */
#define SDL_VIDEO_VULKAN_SURFACE 1
#define SDL_VIDEO_VULKAN 1
#else
#define SDL_VIDEO_VULKAN_SURFACE 0
#define SDL_VIDEO_VULKAN 0
#endif
/* Enable system power support */

3
include/SDL_config_windows.h
View file

@ -208,7 +208,8 @@ typedef unsigned int uintptr_t;
#define SDL_VIDEO_OPENGL_EGL 1
#endif
#define SDL_VIDEO_VULKAN_SURFACE 1
/* Enable Vulkan support */
#define SDL_VIDEO_VULKAN 1
/* Enable system power support */
#define SDL_POWER_WINDOWS 1