ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl1: put behind HAVE_OPENGL1, off by default for now

This commit is contained in:
Brad Parker 2019-02-08 16:04:23 -05:00
parent c83611e526
commit d64933b30d
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.common
View File

@ -1056,15 +1056,21 @@ endif
ifeq ($(HAVE_GL_CONTEXT), 1) ifeq ($(HAVE_GL_CONTEXT), 1)
DEFINES += -DHAVE_OPENGL -DHAVE_GLSL DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
OBJ += gfx/drivers/gl.o \ OBJ += gfx/drivers/gl.o \
gfx/drivers/gl1.o \
$(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \ $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
gfx/drivers_font/gl_raster_font.o \ gfx/drivers_font/gl_raster_font.o \
gfx/drivers_font/gl1_raster_font.o \
$(LIBRETRO_COMM_DIR)/glsym/rglgen.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) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_gl.o \ OBJ += menu/drivers_display/menu_display_gl.o
menu/drivers_display/menu_display_gl1.o
ifeq ($(HAVE_OPENGL1), 1)
OBJ += menu/drivers_display/menu_display_gl1.o
endif
endif endif
ifeq ($(HAVE_VIDEOCORE), 1) ifeq ($(HAVE_VIDEOCORE), 1)

4
gfx/font_driver.c
View File

@ -184,6 +184,7 @@ static bool gl_font_init_first(
return false; return false;
} }
#ifdef HAVE_OPENGL1
static const font_renderer_t *gl1_font_backends[] = { static const font_renderer_t *gl1_font_backends[] = {
&gl1_raster_font, &gl1_raster_font,
NULL, NULL,
@ -213,6 +214,7 @@ static bool gl1_font_init_first(
return false; return false;
} }
#endif #endif
#endif
#ifdef HAVE_CACA #ifdef HAVE_CACA
static const font_renderer_t *caca_font_backends[] = { static const font_renderer_t *caca_font_backends[] = {
@ -659,10 +661,12 @@ static bool font_init_first(
case FONT_DRIVER_RENDER_OPENGL_API: case FONT_DRIVER_RENDER_OPENGL_API:
return gl_font_init_first(font_driver, font_handle, return gl_font_init_first(font_driver, font_handle,
video_data, font_path, font_size, is_threaded); video_data, font_path, font_size, is_threaded);
#ifdef HAVE_OPENGL1
case FONT_DRIVER_RENDER_OPENGL1_API: case FONT_DRIVER_RENDER_OPENGL1_API:
return gl1_font_init_first(font_driver, font_handle, return gl1_font_init_first(font_driver, font_handle,
video_data, font_path, font_size, is_threaded); video_data, font_path, font_size, is_threaded);
#endif #endif
#endif
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
case FONT_DRIVER_RENDER_VULKAN_API: case FONT_DRIVER_RENDER_VULKAN_API:
return vulkan_font_init_first(font_driver, font_handle, return vulkan_font_init_first(font_driver, font_handle,

2
gfx/video_driver.c
View File

@ -260,8 +260,10 @@ struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
static const video_driver_t *video_drivers[] = { static const video_driver_t *video_drivers[] = {
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
&video_gl2, &video_gl2,
#ifdef HAVE_OPENGL1
&video_gl1, &video_gl1,
#endif #endif
#endif
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
&video_vulkan, &video_vulkan,
#endif #endif

6
griffin/griffin.c
View File

@ -411,7 +411,9 @@ VIDEO DRIVER
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../gfx/drivers/gl.c" #include "../gfx/drivers/gl.c"
#ifdef HAVE_OPENGL1
#include "../gfx/drivers/gl1.c" #include "../gfx/drivers/gl1.c"
#endif
#include "../libretro-common/gfx/gl_capabilities.c" #include "../libretro-common/gfx/gl_capabilities.c"
#ifndef HAVE_PSGL #ifndef HAVE_PSGL
@ -489,8 +491,10 @@ FONTS
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
#include "../gfx/drivers_font/gl_raster_font.c" #include "../gfx/drivers_font/gl_raster_font.c"
#ifdef HAVE_OPENGL1
#include "../gfx/drivers_font/gl1_raster_font.c" #include "../gfx/drivers_font/gl1_raster_font.c"
#endif #endif
#endif
#if defined(_XBOX1) #if defined(_XBOX1)
#include "../gfx/drivers_font/xdk1_xfonts.c" #include "../gfx/drivers_font/xdk1_xfonts.c"
@ -1250,8 +1254,10 @@ MENU
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../menu/drivers_display/menu_display_gl.c" #include "../menu/drivers_display/menu_display_gl.c"
#ifdef HAVE_OPENGL1
#include "../menu/drivers_display/menu_display_gl1.c" #include "../menu/drivers_display/menu_display_gl1.c"
#endif #endif
#endif
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
#include "../menu/drivers_display/menu_display_vulkan.c" #include "../menu/drivers_display/menu_display_vulkan.c"

2
menu/menu_driver.c
View File

@ -126,8 +126,10 @@ static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
#endif #endif
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
&menu_display_ctx_gl, &menu_display_ctx_gl,
#ifdef HAVE_OPENGL1
&menu_display_ctx_gl1, &menu_display_ctx_gl1,
#endif #endif
#endif
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
&menu_display_ctx_vulkan, &menu_display_ctx_vulkan,
#endif #endif

3
qb/config.params.sh
View File

@ -56,7 +56,8 @@ C89_D3D11=no
HAVE_D3D12=yes # Direct3D 12 support HAVE_D3D12=yes # Direct3D 12 support
C89_D3D12=no C89_D3D12=no
HAVE_D3DX=yes # Direct3DX support 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_MALI_FBDEV=no # Mali fbdev context support
HAVE_VIVANTE_FBDEV=no # Vivante fbdev context support HAVE_VIVANTE_FBDEV=no # Vivante fbdev context support
HAVE_OPENDINGUX_FBDEV=no # Opendingux fbdev context support HAVE_OPENDINGUX_FBDEV=no # Opendingux fbdev context support