diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 743ee8b865..b398cccc81 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -284,8 +284,10 @@ void notify_content_loaded(void) if (g_runloop.is_idle) continue; - if (g_runloop.is_menu && !menu_display_update_pending() && !g_runloop.frames.video.current.menu.action.active) +#if 0 + if (g_runloop.is_menu && !menu_display_update_pending()) continue; +#endif if (g_view) [g_view display]; diff --git a/menu/menu.c b/menu/menu.c index 5a0f03f3e3..3c0d464216 100644 --- a/menu/menu.c +++ b/menu/menu.c @@ -57,9 +57,7 @@ static void draw_frame(void) } } - if (menu_display_update_pending() || - g_runloop.frames.video.current.menu.action.active ) - rarch_render_cached_frame(); + rarch_render_cached_frame(); } /** diff --git a/menu/menu_entries_cbs_refresh.c b/menu/menu_entries_cbs_refresh.c index a8d22e2c1d..974891a840 100644 --- a/menu/menu_entries_cbs_refresh.c +++ b/menu/menu_entries_cbs_refresh.c @@ -26,7 +26,6 @@ static int action_refresh_default(file_list_t *list, file_list_t *menu_list) ret = menu_entries_deferred_push(list, menu_list); menu->need_refresh = false; - g_runloop.frames.video.current.menu.action.active = true; return ret; } diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 7575ae6b10..8dd8a4d8c1 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -24,7 +24,6 @@ static int action_select_default(unsigned type, const char *label, return 0; menu_list_push_stack(menu->menu_list, "", "info_screen", 0, menu->navigation.selection_ptr); - g_runloop.frames.video.current.menu.action.active = true; return 0; } diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c index 72a2519105..b913d5eac3 100644 --- a/menu/menu_entries_cbs_start.c +++ b/menu/menu_entries_cbs_start.c @@ -29,7 +29,6 @@ static int action_start_remap_file_load(unsigned type, const char *label, { g_settings.input.remapping_path[0] = '\0'; input_remapping_set_defaults(); - g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -38,7 +37,6 @@ static int action_start_video_filter_file_load(unsigned type, const char *label, { g_settings.video.softfilter_plugin[0] = '\0'; rarch_main_command(RARCH_CMD_REINIT); - g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -56,7 +54,6 @@ static int action_start_performance_counters_core(unsigned type, const char *lab { counters[offset]->total = 0; counters[offset]->call_cnt = 0; - g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -74,7 +71,6 @@ static int action_start_input_desc(unsigned type, const char *label, g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] = g_settings.input.binds[inp_desc_user][inp_desc_button_index_offset].id; - g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -93,7 +89,6 @@ static int action_start_shader_action_parameter(unsigned type, const char *label param->current = param->initial; param->current = min(max(param->minimum, param->current), param->maximum); - g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -115,8 +110,6 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0]; param->current = param->initial; param->current = min(max(param->minimum, param->current), param->maximum); - - g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -140,8 +133,6 @@ static int action_start_shader_pass(unsigned type, const char *label, if (shader_pass) *shader_pass->source.path = '\0'; - - g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -169,7 +160,6 @@ static int action_start_shader_scale_pass(unsigned type, const char *label, { shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0; shader_pass->fbo.valid = false; - g_runloop.frames.video.current.menu.action.active = true; } } #endif @@ -196,7 +186,6 @@ static int action_start_shader_filter_pass(unsigned type, const char *label, return -1; shader_pass->filter = RARCH_FILTER_UNSPEC; - g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -219,7 +208,6 @@ static int action_start_shader_num_passes(unsigned type, const char *label, menu->need_refresh = true; video_shader_resolve_parameters(NULL, menu->shader); - g_runloop.frames.video.current.menu.action.active = true; #endif return 0; } @@ -239,7 +227,6 @@ static int action_start_cheat_num_passes(unsigned type, const char *label, { cheat_manager_realloc(cheat, 0); menu->need_refresh = true; - g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -258,7 +245,6 @@ static int action_start_performance_counters_frontend(unsigned type, const char { counters[offset]->total = 0; counters[offset]->call_cnt = 0; - g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -272,7 +258,6 @@ static int action_start_core_setting(unsigned type, (void)label; core_option_set_default(g_extern.system.core_options, idx); - g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -281,7 +266,6 @@ static int action_start_lookup_setting(unsigned type, const char *label, unsigned action) { int ret = menu_setting_set(type, label, MENU_ACTION_START, false); - g_runloop.frames.video.current.menu.action.active = true; return ret; } diff --git a/menu/menu_entries_cbs_toggle.c b/menu/menu_entries_cbs_toggle.c index 0e693cfb7c..3cdb1a9356 100644 --- a/menu/menu_entries_cbs_toggle.c +++ b/menu/menu_entries_cbs_toggle.c @@ -39,12 +39,10 @@ static int shader_action_parameter_toggle(unsigned type, const char *label, { case MENU_ACTION_LEFT: param->current -= param->step; - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: param->current += param->step; - g_runloop.frames.video.current.menu.action.active = true; break; default: @@ -76,12 +74,10 @@ static int shader_action_parameter_preset_toggle(unsigned type, const char *labe { case MENU_ACTION_LEFT: param->current -= param->step; - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: param->current += param->step; - g_runloop.frames.video.current.menu.action.active = true; break; default: @@ -109,7 +105,6 @@ static int action_toggle_cheat(unsigned type, const char *label, case MENU_ACTION_RIGHT: cheat->cheats[idx].state = !cheat->cheats[idx].state; cheat_manager_update(cheat, idx); - g_runloop.frames.video.current.menu.action.active = true; break; } @@ -129,14 +124,12 @@ static int action_toggle_input_desc(unsigned type, const char *label, if (g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] > 0) { g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--; - g_runloop.frames.video.current.menu.action.active = true; } break; case MENU_ACTION_RIGHT: if (g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] < RARCH_FIRST_CUSTOM_BIND) { g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset]++; - g_runloop.frames.video.current.menu.action.active = true; } break; } @@ -154,12 +147,10 @@ static int action_toggle_save_state(unsigned type, const char *label, if (g_settings.state_slot >= 0) { g_settings.state_slot--; - g_runloop.frames.video.current.menu.action.active = true; } break; case MENU_ACTION_RIGHT: g_settings.state_slot++; - g_runloop.frames.video.current.menu.action.active = true; break; } @@ -185,21 +176,18 @@ static int action_toggle_scroll(unsigned type, const char *label, menu->navigation.selection_ptr - fast_scroll_speed, true); else menu_navigation_clear(&menu->navigation, false); - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: if (menu->navigation.selection_ptr + fast_scroll_speed < (menu_list_get_size(menu->menu_list))) { menu_navigation_set(&menu->navigation, menu->navigation.selection_ptr + fast_scroll_speed, true); - g_runloop.frames.video.current.menu.action.active = true; } else { if ((menu_list_get_size(menu->menu_list) > 0)) { menu_navigation_set_last(&menu->navigation); - g_runloop.frames.video.current.menu.action.active = true; } } break; @@ -258,11 +246,9 @@ static int action_toggle_mainmenu(unsigned type, const char *label, "", 0); - g_runloop.frames.video.current.menu.action.active = true; break; case 2: action_toggle_scroll(0, "", action, false); - g_runloop.frames.video.current.menu.action.active = true; break; case 0: default: @@ -302,7 +288,6 @@ static int action_toggle_shader_scale_pass(unsigned type, const char *label, shader_pass->fbo.valid = current_scale; shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = current_scale; - g_runloop.frames.video.current.menu.action.active = true; } break; } @@ -336,7 +321,6 @@ static int action_toggle_shader_filter_pass(unsigned type, const char *label, unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1; shader_pass->filter = ((shader_pass->filter + delta) % 3); - g_runloop.frames.video.current.menu.action.active = true; } break; } @@ -373,13 +357,11 @@ static int action_toggle_cheat_num_passes(unsigned type, const char *label, if (cheat->size) new_size = cheat->size - 1; menu->need_refresh = true; - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: new_size = cheat->size + 1; menu->need_refresh = true; - g_runloop.frames.video.current.menu.action.active = true; break; } @@ -408,14 +390,12 @@ static int action_toggle_shader_num_passes(unsigned type, const char *label, if (shader->passes) shader->passes--; menu->need_refresh = true; - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: if ((shader->passes < GFX_MAX_SHADERS)) shader->passes++; menu->need_refresh = true; - g_runloop.frames.video.current.menu.action.active = true; break; } @@ -460,7 +440,6 @@ static int action_toggle_video_resolution(unsigned type, const char *label, driver.video_poke->get_video_output_prev) { driver.video_poke->get_video_output_prev(driver.video_data); - g_runloop.frames.video.current.menu.action.active = true; } break; case MENU_ACTION_RIGHT: @@ -468,7 +447,6 @@ static int action_toggle_video_resolution(unsigned type, const char *label, driver.video_poke->get_video_output_next) { driver.video_poke->get_video_output_next(driver.video_data); - g_runloop.frames.video.current.menu.action.active = true; } break; } @@ -488,12 +466,10 @@ static int core_setting_toggle(unsigned type, const char *label, { case MENU_ACTION_LEFT: core_option_prev(g_extern.system.core_options, idx); - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: core_option_next(g_extern.system.core_options, idx); - g_runloop.frames.video.current.menu.action.active = true; break; } @@ -507,11 +483,9 @@ static int disk_options_disk_idx_toggle(unsigned type, const char *label, { case MENU_ACTION_LEFT: rarch_main_command(RARCH_CMD_DISK_PREV); - g_runloop.frames.video.current.menu.action.active = true; break; case MENU_ACTION_RIGHT: rarch_main_command(RARCH_CMD_DISK_NEXT); - g_runloop.frames.video.current.menu.action.active = true; break; }