Skip to content

Commit

Permalink
Move KHR_display backend behind configure flag.
Browse files Browse the repository at this point in the history
Enabled by default since it is technically not platform specific.
  • Loading branch information
Hans-Kristian Arntzen committed Jul 7, 2016
1 parent 84d656e commit cd4ff2e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -842,14 +842,17 @@ 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 \
gfx/drivers_shader/glslang_util.o \
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
Expand Down
2 changes: 1 addition & 1 deletion gfx/video_context_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion griffin/griffin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions qb/config.params.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cd4ff2e

Please sign in to comment.