From 25a7cb0f66ad94def3d61a282a0498cf9f4caf37 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 30 Apr 2018 15:19:54 +0200 Subject: [PATCH] (Menu) Rename hack_shader_pass to scratchpad.unsigned_var --- menu/cbs/menu_cbs_ok.c | 4 ++-- menu/cbs/menu_cbs_start.c | 4 ++-- menu/menu_driver.h | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 282d451178..85aa842c2a 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1298,7 +1298,7 @@ static int generic_action_ok(const char *path, case ACTION_OK_LOAD_SHADER_PASS: { struct video_shader *shader = menu_shader_get(); - struct video_shader_pass *shader_pass = shader ? &shader->pass[(unsigned)menu->hack_shader_pass] : NULL; + struct video_shader_pass *shader_pass = shader ? &shader->pass[menu->scratchpad.unsigned_var] : NULL; flush_char = msg_hash_to_str((enum msg_hash_enums)flush_id); if (shader_pass) @@ -3337,7 +3337,7 @@ static int action_ok_shader_pass(const char *path, if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) return menu_cbs_exit(); - menu->hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0; + menu->scratchpad.unsigned_var = type - MENU_SETTINGS_SHADER_PASS_0; return generic_action_ok_displaylist_push(path, NULL, label, type, idx, entry_idx, ACTION_OK_DL_SHADER_PASS); } diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 399c49b490..4564ecdf8a 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -144,9 +144,9 @@ static int action_start_shader_pass(unsigned type, const char *label) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) return menu_cbs_exit(); - menu->hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0; + menu->scratchpad.unsigned_var = type - MENU_SETTINGS_SHADER_PASS_0; - menu_shader_manager_clear_pass_path((unsigned)menu->hack_shader_pass); + menu_shader_manager_clear_pass_path(menu->scratchpad.unsigned_var); return 0; } diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 95a43be1f5..6212d08c99 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -369,7 +369,10 @@ typedef struct unsigned rpl_entry_selection_ptr; unsigned rdb_entry_start_game_selection_ptr; size_t core_len; - size_t hack_shader_pass; + struct + { + unsigned unsigned_var; + } scratchpad; uint64_t state; char *core_buf;