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

Revert "Try to avoid concurrent data access to"

Browse Source 
This reverts commit 8fd43c0927193b5e67877aa38ec0ce6990c9c08e.
This commit is contained in:
twinaphex 2020-03-05 22:21:13 +01:00
parent 8fd43c0927
commit 6ad38b4140
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
retroarch.c
View File

@ -28882,8 +28882,6 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
bool menu_is_alive = menu_driver_alive; bool menu_is_alive = menu_driver_alive;
bool display_kb = menu_input_dialog_get_display_kb(); bool display_kb = menu_input_dialog_get_display_kb();
#endif #endif
unsigned display_width = video_driver_width;
unsigned display_height = video_driver_height;
#if defined(HAVE_TRANSLATE) && defined(HAVE_GFX_WIDGETS) #if defined(HAVE_TRANSLATE) && defined(HAVE_GFX_WIDGETS)
if (gfx_widgets_ai_service_overlay_get_state() == 3) if (gfx_widgets_ai_service_overlay_get_state() == 3)
@ -29052,12 +29050,12 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
* rotation (if required) */ * rotation (if required) */
if (settings->bools.input_overlay_auto_rotate) if (settings->bools.input_overlay_auto_rotate)
{ {
if ((display_width != last_width) || if ((video_driver_width != last_width) ||
(display_height != last_height)) (video_driver_height != last_height))
{ {
input_overlay_auto_rotate(overlay_ptr); input_overlay_auto_rotate(overlay_ptr);
last_width = display_width; last_width = video_driver_width;
last_height = display_height; last_height = video_driver_height;
} }
} }
} }
@ -29167,8 +29165,7 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
current_time, current_time,
settings->bools.menu_timedate_enable, settings->bools.menu_timedate_enable,
settings->floats.menu_ticker_speed, settings->floats.menu_ticker_speed,
display_width, video_driver_width, video_driver_height);
display_height);
#if defined(HAVE_GFX_WIDGETS) #if defined(HAVE_GFX_WIDGETS)
if (gfx_widgets_inited) if (gfx_widgets_inited)
@ -29178,7 +29175,7 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
runloop_msg_queue_lock(); runloop_msg_queue_lock();
gfx_widgets_iterate( gfx_widgets_iterate(
display_width, display_height, video_is_fullscreen, video_driver_width, video_driver_height, video_is_fullscreen,
settings->paths.directory_assets, settings->paths.directory_assets,
settings->paths.path_font, settings->paths.path_font,
video_driver_is_threaded_internal()); video_driver_is_threaded_internal());
@ -29287,8 +29284,8 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
if (menu_data->driver_ctx->render) if (menu_data->driver_ctx->render)
menu_data->driver_ctx->render( menu_data->driver_ctx->render(
menu_data->userdata, menu_data->userdata,
display_width, video_driver_width,
display_height, video_driver_height,
runloop_idle); runloop_idle);
} }