mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add restore_default_state callback - remove more ifdefs

Browse Source
This commit is contained in:
twinaphex 2017-11-08 16:20:55 +01:00
parent 308818afd1
commit a295169a3b
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/drivers/gl.c
View File

@ -1246,14 +1246,10 @@ static bool gl_frame(void *data, const void *frame,
gl_set_viewport(gl, video_info, width, height, false, true);
}
#ifndef HAVE_OPENGLES
if (!gl->core_context_in_use)
glEnable(GL_TEXTURE_2D);
#endif
glDisable(GL_DEPTH_TEST);
if (gl->renderchain_driver->restore_default_state)
gl->renderchain_driver->restore_default_state(gl);
glDisable(GL_STENCIL_TEST);
glDisable(GL_CULL_FACE);
glDisable(GL_DITHER);
glDisable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
@ -1538,7 +1534,6 @@ static void gl_set_nonblock_state(void *data, bool state)
static bool resolve_extensions(gl_t *gl, const char *context_ident)
{
settings_t *settings = config_get_ptr();
#ifndef HAVE_OPENGLES
struct retro_hw_render_callback *hwr =
video_driver_get_hw_context();
@ -1567,7 +1562,7 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
if (gl->renderchain_driver->new_vao)
gl->renderchain_driver->new_vao(gl);
}
#endif
/* ES2 Compat - GL_RGB565 internal format support.
* Even though ES2 support is claimed, the format
* is not supported on older ATI catalyst drivers.
@ -2111,14 +2106,8 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gl_set_texture_fmts(gl, video->rgb32);
#ifndef HAVE_OPENGLES
if (!gl->core_context_in_use)
glEnable(GL_TEXTURE_2D);
#endif
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glDisable(GL_DITHER);
if (gl->renderchain_driver->restore_default_state)
gl->renderchain_driver->restore_default_state(gl);
memcpy(gl->tex_info.coord, tex_coords, sizeof(gl->tex_info.coord));
gl->coords.vertex = gl->vertex_ptr;

15
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -1192,7 +1192,22 @@ static void gl2_renderchain_free_vao(void *data)
}
#endif
static void gl2_renderchain_restore_default_state(void *data)
{
gl_t *gl = (gl_t*)data;
if (!gl)
return;
#ifndef HAVE_OPENGLES
if (!gl->core_context_in_use)
glEnable(GL_TEXTURE_2D);
#endif
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glDisable(GL_DITHER);
}
gl_renderchain_driver_t gl2_renderchain = {
gl2_renderchain_restore_default_state,
#ifdef HAVE_OPENGLES
NULL,
NULL,

1
gfx/video_driver.h
View File

@ -827,6 +827,7 @@ typedef struct d3d_renderchain_driver
typedef struct gl_renderchain_driver
{
void (*restore_default_state)(void *data);
void (*new_vao)(void *data);
void (*free_vao)(void *data);
void (*bind_vao)(void *data);