mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of more ifdefs

Browse Source
This commit is contained in:
twinaphex 2017-11-08 00:05:12 +01:00
parent 0f6a3c8f9d
commit dc700c5d8b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/common/gl_common.h
View File

@ -60,11 +60,8 @@ typedef struct gl
bool quitting; bool quitting;
bool fullscreen; bool fullscreen;
bool keep_aspect; bool keep_aspect;
#ifdef HAVE_OPENGLES
bool support_unpack_row_length; bool support_unpack_row_length;
#else
bool have_es2_compat; bool have_es2_compat;
#endif
bool have_full_npot_support; bool have_full_npot_support;
bool egl_images; bool egl_images;

11
gfx/drivers/gl.c
View File

@ -1596,11 +1596,11 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
* The speed gain from using GL_RGB565 is worth * The speed gain from using GL_RGB565 is worth
* adding some workarounds for. * adding some workarounds for.
*/ */
gl->have_es2_compat = gl_check_capability(GL_CAPS_ES2_COMPAT);
gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT); gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT);
#endif #endif
gl->have_es2_compat = gl_check_capability(GL_CAPS_ES2_COMPAT);
gl->have_sync = gl_check_capability(GL_CAPS_SYNC);
gl->have_sync = gl_check_capability(GL_CAPS_SYNC);
if (gl->have_sync && settings->bools.video_hard_sync) if (gl->have_sync && settings->bools.video_hard_sync)
RARCH_LOG("[GL]: Using ARB_sync to reduce latency.\n"); RARCH_LOG("[GL]: Using ARB_sync to reduce latency.\n");
@ -1616,13 +1616,12 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
} }
/* GLES3 has unpack_subimage and sRGB in core. */ /* GLES3 has unpack_subimage and sRGB in core. */
gl->support_unpack_row_length = gl_check_capability(GL_CAPS_UNPACK_ROW_LENGTH);
gl->has_srgb_fbo_gles3 = gl_check_capability(GL_CAPS_SRGB_FBO_ES3); gl->has_srgb_fbo_gles3 = gl_check_capability(GL_CAPS_SRGB_FBO_ES3);
/* TODO/FIXME - No extensions for float FBO currently. */ /* TODO/FIXME - No extensions for float FBO currently. */
#endif #endif
gl->has_fp_fbo = gl_check_capability(GL_CAPS_FP_FBO); gl->support_unpack_row_length = gl_check_capability(GL_CAPS_UNPACK_ROW_LENGTH);
gl->has_fp_fbo = gl_check_capability(GL_CAPS_FP_FBO);
if (settings->bools.video_force_srgb_disable) if (settings->bools.video_force_srgb_disable)
gl->has_srgb_fbo = false; gl->has_srgb_fbo = false;
else else
@ -1686,7 +1685,6 @@ static INLINE void gl_set_texture_fmts(gl_t *gl, bool rgb32)
gl->texture_type = GL_RGBA; gl->texture_type = GL_RGBA;
} }
} }
#ifndef HAVE_OPENGLES
else if (gl->have_es2_compat) else if (gl->have_es2_compat)
{ {
RARCH_LOG("[GL]: Using GL_RGB565 for texture uploads.\n"); RARCH_LOG("[GL]: Using GL_RGB565 for texture uploads.\n");
@ -1694,7 +1692,6 @@ static INLINE void gl_set_texture_fmts(gl_t *gl, bool rgb32)
gl->texture_type = RARCH_GL_TEXTURE_TYPE16_565; gl->texture_type = RARCH_GL_TEXTURE_TYPE16_565;
gl->texture_fmt = RARCH_GL_FORMAT16_565; gl->texture_fmt = RARCH_GL_FORMAT16_565;
} }
#endif
} }
#ifdef HAVE_GL_ASYNC_READBACK #ifdef HAVE_GL_ASYNC_READBACK