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

Fix full-screen mode change breaking Secondary Core's environment variables

Browse Source 
* RunAhead: Remove Environment Hook from primary core
* Modify core option manager to trigger setting the secondary core's dirty environment flag
* RunAhead: Make secondary core's hook support that change, so it can turn off the dirty environment flag after reading a setting.
This commit is contained in:
Dwedit 2018-05-12 22:11:49 -05:00
parent 7c90933e3a
commit 432b320775
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
managers/core_option_manager.c
View File

@ -29,6 +29,10 @@
#include "../verbosity.h" #include "../verbosity.h"
#ifdef HAVE_RUNAHEAD
#include "../runahead/secondary_core.h"
#endif
static bool core_option_manager_parse_variable( static bool core_option_manager_parse_variable(
core_option_manager_t *opt, size_t idx, core_option_manager_t *opt, size_t idx,
const struct retro_variable *var) const struct retro_variable *var)
@ -128,6 +132,13 @@ void core_option_manager_get(core_option_manager_t *opt, void *data)
if (!opt) if (!opt)
return; return;
#ifdef HAVE_RUNAHEAD
if (opt->updated)
{
secondary_core_set_variable_update(true);
}
#endif
opt->updated = false; opt->updated = false;
for (i = 0; i < opt->size; i++) for (i = 0; i < opt->size; i++)

14
runahead/run_ahead.c
View File

@ -116,7 +116,6 @@ static void remove_hooks(void)
current_core.retro_unload_game = originalRetroUnload; current_core.retro_unload_game = originalRetroUnload;
originalRetroUnload = NULL; originalRetroUnload = NULL;
} }
current_core.retro_set_environment(rarch_environment_cb);
remove_input_state_hook(); remove_input_state_hook();
} }
@ -139,18 +138,6 @@ static void deinit_hook(void)
current_core.retro_deinit(); current_core.retro_deinit();
} }
static bool env_hook(unsigned cmd, void *data)
{
bool result = rarch_environment_cb(cmd, data);
if (cmd == RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE && result)
{
bool *bool_p = (bool*)data;
if (*bool_p == true)
secondary_core_set_variable_update();
}
return result;
}
static void add_hooks(void) static void add_hooks(void)
{ {
if (!originalRetroDeinit) if (!originalRetroDeinit)
@ -164,7 +151,6 @@ static void add_hooks(void)
originalRetroUnload = current_core.retro_unload_game; originalRetroUnload = current_core.retro_unload_game;
current_core.retro_unload_game = unload_hook; current_core.retro_unload_game = unload_hook;
} }
current_core.retro_set_environment(env_hook);
add_input_state_hook(); add_input_state_hook();
} }

9
runahead/secondary_core.c
View File

@ -278,13 +278,20 @@ static bool has_variable_update;
static bool rarch_environment_secondary_core_hook(unsigned cmd, void *data) static bool rarch_environment_secondary_core_hook(unsigned cmd, void *data)
{ {
bool result = rarch_environment_cb(cmd, data); bool result = rarch_environment_cb(cmd, data);
if (cmd == RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE && has_variable_update) if (has_variable_update)
{
if (cmd == RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE)
{ {
bool *bool_p = (bool*)data; bool *bool_p = (bool*)data;
*bool_p = true; *bool_p = true;
has_variable_update = false; has_variable_update = false;
return true; return true;
} }
else if (cmd == RETRO_ENVIRONMENT_GET_VARIABLE)
{
has_variable_update = false;
}
}
return result; return result;
} }