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

Revert "(glcore) switch to glcore video driver when requested"

Browse Source 
This reverts commit 7a3ddcd77d819bb3a35ccaa3180deef982bdd5ef.
This commit is contained in:
twinaphex 2020-05-25 21:31:23 +02:00
parent bcefb124f3
commit 602d3d285c
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
retroarch.c
View File

@ -21003,20 +21003,21 @@ bool video_driver_is_threaded(void)
return video_driver_is_threaded_internal(); return video_driver_is_threaded_internal();
} }
#if defined(HAVE_VULKAN) #ifdef HAVE_VULKAN
static bool hw_render_context_is_vulkan(enum retro_hw_context_type type) static bool hw_render_context_is_vulkan(enum retro_hw_context_type type)
{ {
return type == RETRO_HW_CONTEXT_VULKAN; return type == RETRO_HW_CONTEXT_VULKAN;
} }
#endif #endif
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL_CORE)
static bool hw_render_context_is_gl(enum retro_hw_context_type type) static bool hw_render_context_is_gl(enum retro_hw_context_type type)
{ {
switch (type) switch (type)
{ {
case RETRO_HW_CONTEXT_OPENGL: case RETRO_HW_CONTEXT_OPENGL:
case RETRO_HW_CONTEXT_OPENGLES2: case RETRO_HW_CONTEXT_OPENGLES2:
case RETRO_HW_CONTEXT_OPENGL_CORE:
case RETRO_HW_CONTEXT_OPENGLES3: case RETRO_HW_CONTEXT_OPENGLES3:
case RETRO_HW_CONTEXT_OPENGLES_VERSION: case RETRO_HW_CONTEXT_OPENGLES_VERSION:
return true; return true;
@ -21028,13 +21029,6 @@ static bool hw_render_context_is_gl(enum retro_hw_context_type type)
} }
#endif #endif
#if defined(HAVE_OPENGL_CORE)
static bool hw_render_context_is_glcore(enum retro_hw_context_type type)
{
return type == RETRO_HW_CONTEXT_OPENGL_CORE;
}
#endif
bool *video_driver_get_threaded(void) bool *video_driver_get_threaded(void)
{ {
#if defined(__MACH__) && defined(__APPLE__) #if defined(__MACH__) && defined(__APPLE__)
@ -22372,23 +22366,6 @@ static bool video_driver_find_driver(void)
} }
#endif #endif
#if defined(HAVE_OPENGL_CORE)
if (hwr && hw_render_context_is_glcore(hwr->context_type))
{
RARCH_LOG("[Video]: Using HW render, OpenGL core driver forced.\n");
if (!string_is_equal(settings->arrays.video_driver, "glcore"))
{
RARCH_LOG("[Video]: \"%s\" saved as cached driver.\n", settings->arrays.video_driver);
strlcpy(cached_video_driver, settings->arrays.video_driver,
sizeof(cached_video_driver));
configuration_set_string(settings,
settings->arrays.video_driver,
"glcore");
}
current_video = &video_gl_core;
}
#endif
if (current_video) if (current_video)
return true; return true;
} }