ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move rarch_main_data_overlay_iterate over to data_runloop_iterate

This commit is contained in:
twinaphex 2015-04-13 20:18:32 +02:00
parent 090fddcdbe
commit c25e397261
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runloop_data.c
View File

@ -791,14 +791,7 @@ static void rarch_main_data_overlay_image_upload_iterate(bool is_thread, data_ru
switch (driver->overlay->state) switch (driver->overlay->state)
{ {
case OVERLAY_STATUS_DEFERRED_LOADING: case OVERLAY_STATUS_DEFERRED_LOADING:
switch (driver->overlay->state) input_overlay_load_overlays_iterate(driver->overlay);
{
case OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE:
input_overlay_load_overlays_iterate(driver->overlay);
break;
default:
break;
}
break; break;
default: default:
break; break;
@ -831,16 +824,6 @@ static void rarch_main_data_overlay_iterate(bool is_thread, data_runloop_t *runl
case OVERLAY_STATUS_NONE: case OVERLAY_STATUS_NONE:
case OVERLAY_STATUS_ALIVE: case OVERLAY_STATUS_ALIVE:
break; break;
case OVERLAY_STATUS_DEFERRED_LOADING:
switch (driver->overlay->state)
{
case OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE:
break;
default:
input_overlay_load_overlays_iterate(driver->overlay);
break;
}
break;
case OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE: case OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE:
input_overlay_load_overlays_resolve_iterate(driver->overlay); input_overlay_load_overlays_resolve_iterate(driver->overlay);
break; break;
@ -913,6 +896,9 @@ static void data_runloop_iterate(bool is_thread, data_runloop_t *runloop)
{ {
rarch_main_data_nbio_iterate (is_thread, runloop); rarch_main_data_nbio_iterate (is_thread, runloop);
rarch_main_data_nbio_image_iterate (is_thread, runloop); rarch_main_data_nbio_image_iterate (is_thread, runloop);
#ifdef HAVE_OVERLAY
rarch_main_data_overlay_iterate (is_thread, runloop);
#endif
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
rarch_main_data_http_iterate (is_thread, runloop); rarch_main_data_http_iterate (is_thread, runloop);
#endif #endif
@ -1031,7 +1017,6 @@ void rarch_main_data_iterate(void)
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
rarch_main_data_overlay_image_upload_iterate(false, runloop); rarch_main_data_overlay_image_upload_iterate(false, runloop);
rarch_main_data_overlay_iterate(false, runloop);
#endif #endif
rarch_main_data_nbio_image_upload_iterate(false, runloop); rarch_main_data_nbio_image_upload_iterate(false, runloop);