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

(GL) Move shared_context_use into struct

Browse Source
This commit is contained in:
twinaphex 2020-03-07 17:34:35 +01:00
parent 8ec6447b18
commit b1337d0a21
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/gl_common.h
View File

@ -172,6 +172,7 @@ struct gl
bool has_fbo; bool has_fbo;
bool hw_render_use; bool hw_render_use;
bool core_context_in_use; bool core_context_in_use;
bool shared_context_use;
bool should_resize; bool should_resize;
bool quitting; bool quitting;

12
gfx/drivers/gl.c
View File

@ -137,10 +137,8 @@ static const GLfloat white_color[] = {
1, 1, 1, 1, 1, 1, 1, 1,
}; };
static bool gl_shared_context_use = false;
#define gl2_context_bind_hw_render(gl, enable) \ #define gl2_context_bind_hw_render(gl, enable) \
if (gl_shared_context_use) \ if (gl->shared_context_use) \
gl->ctx_driver->bind_hw_render(gl->ctx_data, enable) gl->ctx_driver->bind_hw_render(gl->ctx_data, enable)
#define MAX_FENCES 4 #define MAX_FENCES 4
@ -3130,8 +3128,6 @@ static void gl2_destroy_resources(gl_t *gl)
free(gl); free(gl);
} }
gl_shared_context_use = false;
gl_query_core_context_unset(); gl_query_core_context_unset();
} }
@ -3410,16 +3406,16 @@ static const gfx_ctx_driver_t *gl2_get_context(gl_t *gl)
#else #else
enum gfx_ctx_api api = GFX_CTX_OPENGL_API; enum gfx_ctx_api api = GFX_CTX_OPENGL_API;
#endif #endif
gl_shared_context_use = video_shared_context gl->shared_context_use = video_shared_context
&& hwr->context_type != RETRO_HW_CONTEXT_NONE; && hwr->context_type != RETRO_HW_CONTEXT_NONE;
if ( (libretro_get_shared_context()) if ( (libretro_get_shared_context())
&& (hwr->context_type != RETRO_HW_CONTEXT_NONE)) && (hwr->context_type != RETRO_HW_CONTEXT_NONE))
gl_shared_context_use = true; gl->shared_context_use = true;
gfx_ctx = video_context_driver_init_first(gl, gfx_ctx = video_context_driver_init_first(gl,
settings->arrays.video_context_driver, settings->arrays.video_context_driver,
api, major, minor, gl_shared_context_use, &ctx_data); api, major, minor, gl->shared_context_use, &ctx_data);
if (ctx_data) if (ctx_data)
gl->ctx_data = ctx_data; gl->ctx_data = ctx_data;