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

Reimplement gl2_get_flags to no longer be reliant on shader driver's 

get flags implementation
This commit is contained in:
twinaphex 2019-03-13 12:11:31 +01:00
parent 1a8b185c5e
commit cd77093588
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gfx/drivers/gl.c
View File

@ -4129,15 +4129,42 @@ static float gl2_get_refresh_rate(void *data)
static uint32_t gl2_get_flags(void *data) static uint32_t gl2_get_flags(void *data)
{ {
gl_t *gl = (gl_t*)data; unsigned i;
uint32_t flags = 0; uint32_t shader_driver_count = 0;
uint32_t flags = 0;
BIT32_SET(flags, GFX_CTX_FLAGS_HARD_SYNC); BIT32_SET(flags, GFX_CTX_FLAGS_HARD_SYNC);
BIT32_SET(flags, GFX_CTX_FLAGS_BLACK_FRAME_INSERTION); BIT32_SET(flags, GFX_CTX_FLAGS_BLACK_FRAME_INSERTION);
BIT32_SET(flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING); BIT32_SET(flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING);
if (gl && gl->shader->get_flags) #ifdef HAVE_GLSL
gl->shader->get_flags(&flags); shader_driver_count++;
#endif
#ifdef HAVE_CG
shader_driver_count++;
#endif
#ifdef HAVE_GLSL
for (i = 0; i < shader_driver_count; i++)
{
if (string_is_equal(gl2_shader_ctx_drivers[i]->ident, "glsl"))
{
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_GLSL);
break;
}
}
#endif
#ifdef HAVE_CG
for (i = 0; i < shader_driver_count; i++)
{
if (string_is_equal(gl2_shader_ctx_drivers[i]->ident, "cg"))
{
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_CG);
break;
}
}
#endif
return flags; return flags;
} }

2
gfx/drivers_shader/shader_gl_cg.c
View File

@ -1236,5 +1236,5 @@ const shader_backend_t gl_cg_backend = {
gl_cg_get_flags, gl_cg_get_flags,
RARCH_SHADER_CG, RARCH_SHADER_CG,
"gl_cg" "cg"
}; };