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

Make sure this is no longer a function behind a ifdef - too much

Browse Source 
maintenance chores
This commit is contained in:
twinaphex 2021-09-26 02:47:43 +02:00
parent 89968333a4
commit ee97c2066a
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
retroarch.c
View File

@ -22096,21 +22096,6 @@ void video_driver_hide_mouse(void)
p_rarch->video_driver_poke->show_mouse(p_rarch->video_driver_data, false); p_rarch->video_driver_poke->show_mouse(p_rarch->video_driver_data, false);
} }
#if defined(HAVE_VULKAN) || defined(HAVE_D3D11) || defined(HAVE_D3D9) || defined(HAVE_OPENGL)
static void video_driver_save_as_cached(struct rarch_state *p_rarch,
settings_t *settings, const char *rdr_context_name)
{
strlcpy(p_rarch->cached_video_driver,
settings->arrays.video_driver,
sizeof(p_rarch->cached_video_driver));
configuration_set_string(settings,
settings->arrays.video_driver,
rdr_context_name);
RARCH_LOG("[Video]: \"%s\" saved as cached driver.\n",
settings->arrays.video_driver);
}
#endif
static void video_driver_restore_cached(struct rarch_state *p_rarch, static void video_driver_restore_cached(struct rarch_state *p_rarch,
settings_t *settings) settings_t *settings)
{ {
@ -22155,7 +22140,16 @@ static bool video_driver_find_driver(struct rarch_state *p_rarch,
if (!string_is_equal(settings->arrays.video_driver, if (!string_is_equal(settings->arrays.video_driver,
rdr_context_name)) rdr_context_name))
video_driver_save_as_cached(p_rarch, settings, rdr_context_name); {
strlcpy(p_rarch->cached_video_driver,
settings->arrays.video_driver,
sizeof(p_rarch->cached_video_driver));
configuration_set_string(settings,
settings->arrays.video_driver,
rdr_context_name);
RARCH_LOG("[Video]: \"%s\" saved as cached driver.\n",
settings->arrays.video_driver);
}
p_rarch->current_video = hw_render_context_driver(rdr_type, rdr_major, rdr_minor); p_rarch->current_video = hw_render_context_driver(rdr_type, rdr_major, rdr_minor);
return true; return true;
@ -22172,14 +22166,28 @@ static bool video_driver_find_driver(struct rarch_state *p_rarch,
if ( !string_is_equal(settings->arrays.video_driver, "gl") && if ( !string_is_equal(settings->arrays.video_driver, "gl") &&
!string_is_equal(settings->arrays.video_driver, "glcore")) !string_is_equal(settings->arrays.video_driver, "glcore"))
{ {
video_driver_save_as_cached(p_rarch, settings, "glcore"); strlcpy(p_rarch->cached_video_driver,
settings->arrays.video_driver,
sizeof(p_rarch->cached_video_driver));
configuration_set_string(settings,
settings->arrays.video_driver,
"glcore");
RARCH_LOG("[Video]: \"%s\" saved as cached driver.\n",
settings->arrays.video_driver);
p_rarch->current_video = &video_gl_core; p_rarch->current_video = &video_gl_core;
return true; return true;
} }
#else #else
if ( !string_is_equal(settings->arrays.video_driver, "gl")) if ( !string_is_equal(settings->arrays.video_driver, "gl"))
{ {
video_driver_save_as_cached(p_rarch, settings, "gl"); strlcpy(p_rarch->cached_video_driver,
settings->arrays.video_driver,
sizeof(p_rarch->cached_video_driver));
configuration_set_string(settings,
settings->arrays.video_driver,
"gl");
RARCH_LOG("[Video]: \"%s\" saved as cached driver.\n",
settings->arrays.video_driver);
p_rarch->current_video = &video_gl2; p_rarch->current_video = &video_gl2;
return true; return true;
} }