mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GL) Grab pointer to shader first

Browse Source
This commit is contained in:
twinaphex 2014-10-02 10:39:13 +02:00
parent 6316876ad3
commit 475283a35f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/gl.c
View File

@ -1526,6 +1526,7 @@ static bool gl_frame(void *data, const void *frame,
gl_t *gl = (gl_t*)data;
gfx_ctx_driver_t *ctx_driver = (gfx_ctx_driver_t*)gl->ctx_driver;
gl_shader_backend_t *shader = (gl_shader_backend_t*)gl->shader;
if (!gl)
return true;
@ -1537,8 +1538,8 @@ static bool gl_frame(void *data, const void *frame,
glBindVertexArray(gl->vao);
#endif
if (gl->shader)
gl->shader->use(gl, 1);
if (shader)
shader->use(gl, 1);
#ifdef IOS
/* Apparently the viewport is lost each frame, thanks Apple. */
@ -1632,8 +1633,8 @@ static bool gl_frame(void *data, const void *frame,
glClear(GL_COLOR_BUFFER_BIT);
if (gl->shader && gl->shader->set_params)
gl->shader->set_params(gl, width, height,
if (shader && shader->set_params)
shader->set_params(gl, width, height,
gl->tex_w, gl->tex_h,
gl->vp.width, gl->vp.height,
g_extern.frame_count,
@ -1675,8 +1676,8 @@ static bool gl_frame(void *data, const void *frame,
/* Reset state which could easily mess up libretro core. */
if (gl->hw_render_fbo_init)
{
if (gl->shader)
gl->shader->use(gl, 0);
if (shader)
shader->use(gl, 0);
glBindTexture(GL_TEXTURE_2D, 0);
#ifndef NO_GL_FF_VERTEX
gl_disable_client_arrays(gl);