From cd4ff2eac829de6f167001fa173682706a5fa721 Mon Sep 17 00:00:00 2001
From: Hans-Kristian Arntzen <maister@archlinux.us>
Date: Thu, 7 Jul 2016 22:03:30 +0200
Subject: [PATCH] Move KHR_display backend behind configure flag.

Enabled by default since it is technically not platform specific.
---
 Makefile.common            | 5 ++++-
 gfx/video_context_driver.c | 2 +-
 griffin/griffin.c          | 4 +++-
 qb/config.params.sh        | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 5b28285af0..2f5d8d02f8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -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
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
index a2cb8a196d..2999985344 100644
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@@ -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,
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 269bec3c61..000eec1ff6 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -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)
diff --git a/qb/config.params.sh b/qb/config.params.sh
index b6cc9ae77e..d572c9dbaa 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -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