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

(GL) Nits

This commit is contained in:
twinaphex 2016-05-05 02:07:33 +02:00
parent 2c77616ec3
commit eb2a4f5c56
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/drivers/gl.c
View File

@ -2358,11 +2358,11 @@ static INLINE void gl_set_texture_fmts(gl_t *gl, bool rgb32)
static void gl_init_pbo_readback(gl_t *gl) static void gl_init_pbo_readback(gl_t *gl)
{ {
unsigned i; unsigned i;
struct scaler_ctx *scaler = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool *recording_enabled = recording_is_enabled(); bool *recording_enabled = recording_is_enabled();
#ifndef HAVE_OPENGLES3
(void)scaler; struct scaler_ctx *scaler = NULL;
#endif
/* Only bother with this if we're doing GPU recording. /* Only bother with this if we're doing GPU recording.
* Check recording_is_enabled() and not * Check recording_is_enabled() and not
@ -2413,30 +2413,31 @@ static const gfx_ctx_driver_t *gl_get_context(gl_t *gl)
{ {
enum gfx_ctx_api api; enum gfx_ctx_api api;
unsigned major, minor; unsigned major, minor;
const char *api_name = NULL; const char *api_name = NULL;
struct retro_hw_render_callback *hwr = NULL; struct retro_hw_render_callback *hwr = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
video_driver_ctl(RARCH_DISPLAY_CTL_HW_CONTEXT_GET, &hwr); video_driver_ctl(RARCH_DISPLAY_CTL_HW_CONTEXT_GET, &hwr);
major = hwr->version_major; major = hwr->version_major;
minor = hwr->version_minor; minor = hwr->version_minor;
#ifdef HAVE_OPENGLES #ifdef HAVE_OPENGLES
api = GFX_CTX_OPENGL_ES_API; api = GFX_CTX_OPENGL_ES_API;
api_name = "OpenGL ES 2.0"; api_name = "OpenGL ES 2.0";
#ifdef HAVE_OPENGLES3 #ifdef HAVE_OPENGLES3
if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES3) if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES3)
{ {
major = 3; major = 3;
minor = 0; minor = 0;
api_name = "OpenGL ES 3.0"; api_name = "OpenGL ES 3.0";
} }
else if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION) else if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION)
api_name = "OpenGL ES 3.1+"; api_name = "OpenGL ES 3.1+";
#endif #endif
#else #else
api = GFX_CTX_OPENGL_API; api = GFX_CTX_OPENGL_API;
api_name = "OpenGL"; api_name = "OpenGL";
#endif #endif
(void)api_name; (void)api_name;