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

Merge pull request #10601 from barbudreadmon/patch-4

Browse Source 
(glcore) switch to glcore video driver when requested
This commit is contained in:
Autechre 2020-05-09 22:33:46 +02:00 committed by GitHub
commit aa5ddee807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
retroarch.c
View File

@ -22363,21 +22363,20 @@ bool video_driver_is_threaded(void)
return video_driver_is_threaded_internal();
}
#ifdef HAVE_VULKAN
#if defined(HAVE_VULKAN)
static bool hw_render_context_is_vulkan(enum retro_hw_context_type type)
{
return type == RETRO_HW_CONTEXT_VULKAN;
}
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL_CORE)
#if defined(HAVE_OPENGL)
static bool hw_render_context_is_gl(enum retro_hw_context_type type)
{
switch (type)
{
case RETRO_HW_CONTEXT_OPENGL:
case RETRO_HW_CONTEXT_OPENGLES2:
case RETRO_HW_CONTEXT_OPENGL_CORE:
case RETRO_HW_CONTEXT_OPENGLES3:
case RETRO_HW_CONTEXT_OPENGLES_VERSION:
return true;
@ -22389,6 +22388,13 @@ static bool hw_render_context_is_gl(enum retro_hw_context_type type)
}
#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)
{
#if defined(__MACH__) && defined(__APPLE__)
@ -23702,6 +23708,23 @@ static bool video_driver_find_driver(void)
}
#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)
return true;
}