mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GL) Cleanups

Browse Source 
(Emscripten) Add HAVE_RPNG/HAVE_RJPEG
This commit is contained in:
twinaphex 2016-08-01 16:25:02 +02:00
parent 78217ca32b
commit 6d76a04b0f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.emscripten
View File

@ -8,6 +8,8 @@ DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVER
HAVE_EGL = 1 HAVE_EGL = 1
HAVE_OPENGL = 1 HAVE_OPENGL = 1
HAVE_GLES = 1 HAVE_GLES = 1
HAVE_RJPEG = 1
HAVE_RPNG = 1
HAVE_EMSCRIPTEN = 1 HAVE_EMSCRIPTEN = 1
HAVE_RGUI = 1 HAVE_RGUI = 1
HAVE_SDL = 0 HAVE_SDL = 0

10
gfx/drivers/gl.c
View File

@ -371,7 +371,7 @@ static bool gl_check_capability(enum gl_capability_enum enum_idx)
&& !gl_query_extension("EXT_framebuffer_object")) && !gl_query_extension("EXT_framebuffer_object"))
return false; return false;
return glGenFramebuffers if (glGenFramebuffers
&& glBindFramebuffer && glBindFramebuffer
&& glFramebufferTexture2D && glFramebufferTexture2D
&& glCheckFramebufferStatus && glCheckFramebufferStatus
@ -380,7 +380,8 @@ static bool gl_check_capability(enum gl_capability_enum enum_idx)
&& glBindRenderbuffer && glBindRenderbuffer
&& glFramebufferRenderbuffer && glFramebufferRenderbuffer
&& glRenderbufferStorage && glRenderbufferStorage
&& glDeleteRenderbuffers; && glDeleteRenderbuffers)
return true;
#else #else
return true; return true;
#endif #endif
@ -2352,13 +2353,10 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
#if defined(HAVE_GL_SYNC) || defined(HAVE_FBO) #if defined(HAVE_GL_SYNC) || defined(HAVE_FBO)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#endif #endif
#ifndef HAVE_OPENGLES
struct retro_hw_render_callback *hwr = struct retro_hw_render_callback *hwr =
video_driver_get_hw_context(); video_driver_get_hw_context();
(void)renderer;
(void)version;
(void)hwr;
#ifndef HAVE_OPENGLES
gl_core_context = gl_core_context =
(hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE); (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE);