From d64933b30d23bfc8c65d2007f27f634b95751a36 Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Fri, 8 Feb 2019 16:04:23 -0500
Subject: [PATCH] gl1: put behind HAVE_OPENGL1, off by default for now

---
 Makefile.common     | 14 ++++++++++----
 gfx/font_driver.c   |  4 ++++
 gfx/video_driver.c  |  2 ++
 griffin/griffin.c   |  6 ++++++
 menu/menu_driver.c  |  2 ++
 qb/config.params.sh |  3 ++-
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 9352bfa7b7..f8d9f9cb41 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1056,15 +1056,21 @@ endif
 ifeq ($(HAVE_GL_CONTEXT), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
-          gfx/drivers/gl1.o \
           $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
           gfx/drivers_font/gl_raster_font.o \
-          gfx/drivers_font/gl1_raster_font.o \
           $(LIBRETRO_COMM_DIR)/glsym/rglgen.o
 
+   ifeq ($(HAVE_OPENGL1), 1)
+      OBJ += gfx/drivers/gl1.o \
+             gfx/drivers_font/gl1_raster_font.o
+   endif
+
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/menu_display_gl.o \
-             menu/drivers_display/menu_display_gl1.o
+      OBJ += menu/drivers_display/menu_display_gl.o
+
+      ifeq ($(HAVE_OPENGL1), 1)
+         OBJ += menu/drivers_display/menu_display_gl1.o
+      endif
    endif
 
    ifeq ($(HAVE_VIDEOCORE), 1)
diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 7b53005901..65677bbad5 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -184,6 +184,7 @@ static bool gl_font_init_first(
    return false;
 }
 
+#ifdef HAVE_OPENGL1
 static const font_renderer_t *gl1_font_backends[] = {
    &gl1_raster_font,
    NULL,
@@ -213,6 +214,7 @@ static bool gl1_font_init_first(
    return false;
 }
 #endif
+#endif
 
 #ifdef HAVE_CACA
 static const font_renderer_t *caca_font_backends[] = {
@@ -659,10 +661,12 @@ static bool font_init_first(
       case FONT_DRIVER_RENDER_OPENGL_API:
          return gl_font_init_first(font_driver, font_handle,
                video_data, font_path, font_size, is_threaded);
+#ifdef HAVE_OPENGL1
       case FONT_DRIVER_RENDER_OPENGL1_API:
          return gl1_font_init_first(font_driver, font_handle,
                video_data, font_path, font_size, is_threaded);
 #endif
+#endif
 #ifdef HAVE_VULKAN
       case FONT_DRIVER_RENDER_VULKAN_API:
          return vulkan_font_init_first(font_driver, font_handle,
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index a6f5f29fae..d501fcf60c 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -260,8 +260,10 @@ struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
 static const video_driver_t *video_drivers[] = {
 #ifdef HAVE_OPENGL
    &video_gl2,
+#ifdef HAVE_OPENGL1
    &video_gl1,
 #endif
+#endif
 #ifdef HAVE_VULKAN
    &video_vulkan,
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5d34ee0117..c87e2c260a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -411,7 +411,9 @@ VIDEO DRIVER
 
 #ifdef HAVE_OPENGL
 #include "../gfx/drivers/gl.c"
+#ifdef HAVE_OPENGL1
 #include "../gfx/drivers/gl1.c"
+#endif
 #include "../libretro-common/gfx/gl_capabilities.c"
 
 #ifndef HAVE_PSGL
@@ -489,8 +491,10 @@ FONTS
 
 #if defined(HAVE_OPENGL)
 #include "../gfx/drivers_font/gl_raster_font.c"
+#ifdef HAVE_OPENGL1
 #include "../gfx/drivers_font/gl1_raster_font.c"
 #endif
+#endif
 
 #if defined(_XBOX1)
 #include "../gfx/drivers_font/xdk1_xfonts.c"
@@ -1250,8 +1254,10 @@ MENU
 
 #ifdef HAVE_OPENGL
 #include "../menu/drivers_display/menu_display_gl.c"
+#ifdef HAVE_OPENGL1
 #include "../menu/drivers_display/menu_display_gl1.c"
 #endif
+#endif
 
 #ifdef HAVE_VULKAN
 #include "../menu/drivers_display/menu_display_vulkan.c"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 1375981f57..9805eb8429 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -126,8 +126,10 @@ static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
 #endif
 #ifdef HAVE_OPENGL
    &menu_display_ctx_gl,
+#ifdef HAVE_OPENGL1
    &menu_display_ctx_gl1,
 #endif
+#endif
 #ifdef HAVE_VULKAN
    &menu_display_ctx_vulkan,
 #endif
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 34f83cddfc..33bca52459 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -56,7 +56,8 @@ C89_D3D11=no
 HAVE_D3D12=yes             # Direct3D 12 support
 C89_D3D12=no
 HAVE_D3DX=yes              # Direct3DX support
-HAVE_OPENGL=auto           # OpenGL support
+HAVE_OPENGL=auto           # OpenGL 2.0 support
+HAVE_OPENGL1=no            # OpenGL 1.1 support
 HAVE_MALI_FBDEV=no         # Mali fbdev context support
 HAVE_VIVANTE_FBDEV=no      # Vivante fbdev context support
 HAVE_OPENDINGUX_FBDEV=no   # Opendingux fbdev context support