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

Merge pull request #12878 from libretro/input-get-rid-of-getters-setters

Browse Source 
Get rid of getters/setters in big driver files from now
This commit is contained in:
Autechre 2021-08-26 14:58:33 +02:00 committed by GitHub
commit c66bcc05cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
input/input_driver.c
View File

@ -357,7 +357,7 @@ float input_driver_get_sensor(
return 0.0f; return 0.0f;
current_driver = driver_state->current_driver; current_driver = driver_state->current_driver;
current_data = driver_state->current_data; current_data = driver_state->current_data;
if (sensors_enable && current_driver->get_sensor_input) if (sensors_enable && current_driver->get_sensor_input)
return current_driver->get_sensor_input(current_data, port, id); return current_driver->get_sensor_input(current_data, port, id);
@ -365,27 +365,6 @@ float input_driver_get_sensor(
return 0.0f; return 0.0f;
} }
/**************************************/
bool input_driver_get_nonblocking(input_driver_state_t *driver_state)
{
if (!driver_state)
return false;
return driver_state->nonblocking_flag;
}
void input_driver_set_nonblocking(input_driver_state_t *driver_state,
bool new_value)
{
if (!driver_state)
return;
driver_state->nonblocking_flag = new_value;
}
/**************************************/
const input_device_driver_t *input_joypad_init_driver( const input_device_driver_t *input_joypad_init_driver(
const char *ident, void *data) const char *ident, void *data)
{ {

6
input/input_driver.h
View File

@ -345,12 +345,6 @@ float input_driver_get_sensor(
input_driver_state_t *driver_state, input_driver_state_t *driver_state,
unsigned port, bool sensors_enable, unsigned id); unsigned port, bool sensors_enable, unsigned id);
bool input_driver_get_nonblocking(input_driver_state_t *driver_state);
void input_driver_set_nonblocking(input_driver_state_t *driver_state,
bool new_value);
/** /**
* Get an enumerated list of all joypad driver names * Get an enumerated list of all joypad driver names
* *

59
retroarch.c
View File

@ -15787,7 +15787,7 @@ void emscripten_mainloop(void)
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state); input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
bool black_frame_insertion = settings->uints.video_black_frame_insertion; bool black_frame_insertion = settings->uints.video_black_frame_insertion;
bool input_driver_nonblock_state = input_driver_get_nonblocking(input_driver_st); bool input_driver_nonblock_state = input_driver_st ? input_driver_st->nonblocking_flag : false;
bool runloop_is_slowmotion = runloop_state.slowmotion; bool runloop_is_slowmotion = runloop_state.slowmotion;
bool runloop_is_paused = runloop_state.paused; bool runloop_is_paused = runloop_state.paused;
@ -21872,15 +21872,17 @@ void input_set_nonblock_state(void)
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state; input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
input_driver_set_nonblocking(input_driver_st, true); if (input_driver_st)
input_driver_st->nonblocking_flag = true;
} }
void input_unset_nonblock_state(void) void input_unset_nonblock_state(void)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state; input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
input_driver_set_nonblocking(input_driver_st, false); if (input_driver_st)
input_driver_st->nonblocking_flag = false;
} }
void *input_driver_get_data(void) void *input_driver_get_data(void)
@ -31924,14 +31926,15 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->menu_wallpaper_opacity = 0.0f; video_info->menu_wallpaper_opacity = 0.0f;
#endif #endif
video_info->runloop_is_paused = runloop_state.paused; video_info->runloop_is_paused = runloop_state.paused;
video_info->runloop_is_slowmotion = runloop_state.slowmotion; video_info->runloop_is_slowmotion = runloop_state.slowmotion;
video_info->input_driver_nonblock_state = input_driver_get_nonblocking(input_driver_st); video_info->input_driver_nonblock_state = input_driver_st ?
input_driver_st->nonblocking_flag : false;
video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state; video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state;
video_info->disp_userdata = &p_rarch->dispgfx; video_info->disp_userdata = &p_rarch->dispgfx;
video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch); video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
VIDEO_DRIVER_THREADED_UNLOCK(is_threaded); VIDEO_DRIVER_THREADED_UNLOCK(is_threaded);
@ -32870,9 +32873,12 @@ static void driver_adjust_system_rates(
**/ **/
void driver_set_nonblock_state(void) void driver_set_nonblock_state(void)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state; *p_rarch = &rarch_st;
bool enable = input_driver_get_nonblocking(input_driver_st); input_driver_state_t
*input_driver_st = &p_rarch->input_driver_state;
bool enable = input_driver_st ?
input_driver_st->nonblocking_flag : false;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
bool audio_sync = settings->bools.audio_sync; bool audio_sync = settings->bools.audio_sync;
bool video_vsync = settings->bools.video_vsync; bool video_vsync = settings->bools.video_vsync;
@ -33101,7 +33107,7 @@ static void drivers_init(struct rarch_state *p_rarch,
if (flags & (DRIVER_VIDEO_MASK | DRIVER_AUDIO_MASK)) if (flags & (DRIVER_VIDEO_MASK | DRIVER_AUDIO_MASK))
{ {
/* Keep non-throttled state as good as possible. */ /* Keep non-throttled state as good as possible. */
if (input_driver_get_nonblocking(input_driver_st)) if (input_driver_st && input_driver_st->nonblocking_flag)
driver_set_nonblock_state(); driver_set_nonblock_state();
} }
@ -33263,7 +33269,9 @@ static void retroarch_deinit_drivers(
p_rarch->input_driver_keyboard_linefeed_enable = false; p_rarch->input_driver_keyboard_linefeed_enable = false;
p_rarch->input_driver_block_hotkey = false; p_rarch->input_driver_block_hotkey = false;
p_rarch->input_driver_block_libretro_input = false; p_rarch->input_driver_block_libretro_input = false;
input_driver_set_nonblocking(input_driver_st, false);
if (input_driver_st)
input_driver_st->nonblocking_flag = false;
p_rarch->input_driver_flushing_input = 0; p_rarch->input_driver_flushing_input = 0;
memset(&p_rarch->input_driver_turbo_btns, 0, sizeof(turbo_buttons_t)); memset(&p_rarch->input_driver_turbo_btns, 0, sizeof(turbo_buttons_t));
@ -37140,14 +37148,19 @@ static void runloop_apply_fastmotion_override(
if (p_runloop->fastmotion != if (p_runloop->fastmotion !=
p_runloop->fastmotion_override.current.fastforward) p_runloop->fastmotion_override.current.fastforward)
{ {
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
p_runloop->fastmotion = p_runloop->fastmotion =
p_runloop->fastmotion_override.current.fastforward; p_runloop->fastmotion_override.current.fastforward;
if (p_runloop->fastmotion) if (p_runloop->fastmotion)
input_driver_set_nonblocking(&p_rarch->input_driver_state, true); {
if (input_driver_st)
input_driver_st->nonblocking_flag = true;
}
else else
{ {
input_driver_set_nonblocking(&p_rarch->input_driver_state, false); if (input_driver_st)
input_driver_st->nonblocking_flag = false;
p_rarch->fastforward_after_frames = 1; p_rarch->fastforward_after_frames = 1;
} }
@ -38127,11 +38140,17 @@ static enum runloop_state runloop_check_state(
if (check2) if (check2)
{ {
bool check1 = input_driver_get_nonblocking(input_driver_st); if (input_driver_st->nonblocking_flag)
input_driver_set_nonblocking(input_driver_st, !check1); {
runloop_state.fastmotion = !check1; input_driver_st->nonblocking_flag = false;
if (check1) runloop_state.fastmotion = false;
p_rarch->fastforward_after_frames = 1; p_rarch->fastforward_after_frames = 1;
}
else
{
input_driver_st->nonblocking_flag = true;
runloop_state.fastmotion = true;
}
driver_set_nonblock_state(); driver_set_nonblock_state();
@ -38637,7 +38656,7 @@ int runloop_iterate(void)
} }
} }
if ((video_frame_delay > 0) && !input_driver_get_nonblocking(input_driver_st)) if ((video_frame_delay > 0) && input_driver_st && !input_driver_st->nonblocking_flag)
retro_sleep(video_frame_delay); retro_sleep(video_frame_delay);
{ {