Move KHR_display backend behind configure flag.

Enabled by default since it is technically not platform specific.
This commit is contained in:
Hans-Kristian Arntzen 2016-07-07 22:03:30 +02:00
parent 84d656ea67
commit cd4ff2eac8
4 changed files with 9 additions and 3 deletions

View File

@ -842,7 +842,6 @@ ifeq ($(HAVE_VULKAN), 1)
OBJ += gfx/drivers/vulkan.o \
gfx/common/vulkan_common.o \
gfx/drivers_context/khr_display_ctx.o \
libretro-common/vulkan/vulkan_symbol_wrapper.o \
gfx/drivers_font/vulkan_raster_font.o \
gfx/drivers_shader/shader_vulkan.o \
@ -850,6 +849,10 @@ ifeq ($(HAVE_VULKAN), 1)
gfx/drivers_shader/slang_reflection.o \
$(GLSLANG_OBJ) \
$(SPIRV_CROSS_OBJ)
ifeq ($(HAVE_VULKAN_KHR_DISPLAY), 1)
OBJ += gfx/drivers_context/khr_display_ctx.o
endif
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_vulkan.o
endif

View File

@ -81,7 +81,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#ifdef EMSCRIPTEN
&gfx_ctx_emscripten,
#endif
#ifdef HAVE_VULKAN
#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_KHR_DISPLAY)
&gfx_ctx_khr_display,
#endif
&gfx_ctx_null,

View File

@ -167,8 +167,10 @@ VIDEO CONTEXT
#ifdef HAVE_VULKAN
#include "../gfx/common/vulkan_common.c"
#include "../gfx/drivers_context/khr_display_ctx.c"
#include "../libretro-common/vulkan/vulkan_symbol_wrapper.c"
#ifdef HAVE_VULKAN_KHR_DISPLAY
#include "../gfx/drivers_context/khr_display_ctx.c"
#endif
#endif
#if defined(HAVE_KMS)

View File

@ -77,6 +77,7 @@ HAVE_CHEEVOS=yes # Retro Achievements
HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines
C89_SHADERPIPELINE=no
HAVE_VULKAN=auto # Vulkan support
HAVE_VULKAN_KHR_DISPLAY=yes # Vulkan KHR display backend support
C89_VULKAN=no
HAVE_RPNG=yes # RPNG support
HAVE_RBMP=yes # RBMP support