From 7d624fdedb4a3655d9fc22afe4d1b4dd96491832 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Jan 2017 22:18:00 +0100
Subject: [PATCH] Push some build fixes when compiling with --disable-opengl
 --disable-shaderpipeline

---
 gfx/drivers_context/drm_ctx.c              | 1 +
 gfx/drivers_context/x_ctx.c                | 2 +-
 menu/drivers_display/menu_display_vulkan.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index 3500443857..ed6df8a230 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -20,6 +20,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+#include <string.h>
 #include <unistd.h>
 #include <math.h>
 
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index 2092651680..0dad497fc8 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -109,7 +109,6 @@ static gfx_ctx_x_data_t *current_context_data = NULL;
 
 #ifdef HAVE_OPENGL
 static PFNGLXCREATECONTEXTATTRIBSARBPROC glx_create_context_attribs;
-#endif
 
 static int GLXExtensionSupported(Display *dpy, const char *extension)
 {
@@ -134,6 +133,7 @@ static int GLXExtensionSupported(Display *dpy, const char *extension)
 
    return 0;
 }
+#endif
 
 static int x_nul_handler(Display *dpy, XErrorEvent *event)
 {
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 85b81ccfcb..3e99dc454f 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -66,6 +66,7 @@ static unsigned to_display_pipeline(
    return ((type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) << 1) | (blend << 0);
 }
 
+#ifdef HAVE_SHADERPIPELINE
 static unsigned to_menu_pipeline(
       enum menu_display_prim_type type, unsigned pipeline)
 {
@@ -79,6 +80,7 @@ static unsigned to_menu_pipeline(
          return 0;
    }
 }
+#endif
 
 static void menu_display_vk_viewport(void *data)
 {