diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ac33134a2b..402260b7e2 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -720,18 +720,28 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info) if (!shader) return -1; - menu_list_push(info->list, "Apply Shader Changes", "shader_apply_changes", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_SHADER_APPLY_CHANGES), + menu_hash_to_str(MENU_LABEL_SHADER_APPLY_CHANGES), MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Load Shader Preset", "video_shader_preset", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET), + menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET), MENU_FILE_PATH, 0, 0); - menu_list_push(info->list, "Shader Preset Save As", - "video_shader_preset_save_as", MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Parameters (Current)", - "video_shader_parameters", MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Parameters (Menu)", - "video_shader_preset_parameters", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS), + menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS), MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Shader Passes", + menu_list_push(info->list, + "Current Shader Parameters", + menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PARAMETERS), + MENU_SETTING_ACTION, 0, 0); + menu_list_push(info->list, + "Menu Shader Parameters (Menu)", + menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS), + MENU_SETTING_ACTION, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES), menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_NUM_PASSES), 0, 0, 0); diff --git a/menu/menu_hash.c b/menu/menu_hash.c index dec84860d7..0c43005658 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -193,6 +193,10 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_SHADER_APPLY_CHANGES: + return "Apply Shader Changes"; + case MENU_LABEL_SHADER_APPLY_CHANGES: + return "shader_apply_changes"; case MENU_LABEL_COLLECTION: return "collection"; case MENU_LABEL_REWIND_ENABLE: @@ -241,6 +245,8 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "video_shader_filter_pass"; case MENU_LABEL_VIDEO_SHADER_SCALE_PASS: return "video_shader_scale_pass"; + case MENU_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES: + return "Shader Passes"; case MENU_LABEL_VIDEO_SHADER_NUM_PASSES: return "video_shader_num_passes"; case MENU_LABEL_RDB_ENTRY_DESCRIPTION: @@ -521,8 +527,20 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "Shader Options"; case MENU_LABEL_SHADER_OPTIONS: return "shader_options"; + case MENU_LABEL_VIDEO_SHADER_PARAMETERS: + return "video_shader_parameters"; + case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS: + return "video_shader_preset_parameters"; + case MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS: + return "Shader Preset Save As"; + case MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS: + return "video_shader_preset_save_as"; case MENU_LABEL_VALUE_NO_SHADER_PARAMETERS: return "No shader parameters."; + case MENU_LABEL_VIDEO_SHADER_PRESET: + return "video_shader_preset"; + case MENU_LABEL_VALUE_VIDEO_SHADER_PRESET: + return "Load Shader Preset"; case MENU_LABEL_VIDEO_FILTER: return "video_filter"; case MENU_LABEL_VALUE_VIDEO_FILTER: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 85d704ebdf..f967a07f68 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -218,6 +218,7 @@ extern "C" { #define MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER 0x4468cb1bU #define MENU_LABEL_VIDEO_SHADER_FILTER_PASS 0x1906c38dU #define MENU_LABEL_VIDEO_SHADER_SCALE_PASS 0x18f7b82fU +#define MENU_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES 0xb354b30bU #define MENU_LABEL_VIDEO_SHADER_NUM_PASSES 0x79b2992fU #define MENU_LABEL_CHEAT_NUM_PASSES 0x1910eb87U @@ -331,6 +332,7 @@ extern "C" { #define MENU_LABEL_DATABASE_MANAGER_LIST 0x7f853d8fU #define MENU_LABEL_CURSOR_MANAGER_LIST 0xa969e378U #define MENU_LABEL_VIDEO_SHADER_PASS 0x4fa31028U +#define MENU_LABEL_VALUE_VIDEO_SHADER_PRESET 0xd149336fU #define MENU_LABEL_VIDEO_SHADER_PRESET 0xc5d3bae4U #define MENU_LABEL_CHEAT_FILE_LOAD 0x57336148U #define MENU_LABEL_VALUE_CHEAT_FILE_LOAD 0x5b983e0aU @@ -422,6 +424,7 @@ extern "C" { #define MENU_LABEL_DIRECTORY_SETTINGS 0xb817bd2bU #define MENU_LABEL_PRIVACY_SETTINGS 0xce106254U #define MENU_LABEL_SHADER_APPLY_CHANGES 0x4f7306b9U +#define MENU_LABEL_VALUE_SHADER_APPLY_CHANGES 0x5ecf945bU #define MENU_LABEL_SAVE_NEW_CONFIG 0xcce9ab72U #define MENU_LABEL_VALUE_SAVE_NEW_CONFIG 0xd49f2c94U #define MENU_LABEL_ONSCREEN_DISPLAY_SETTINGS 0x67571029U @@ -447,6 +450,7 @@ extern "C" { #define MENU_LABEL_VALUE_REMAP_FILE_SAVE_AS 0x3ce7a81dU #define MENU_LABEL_REMAP_FILE_SAVE_AS 0xcebf7f3aU #define MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS 0x3d6e5ce5U +#define MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS 0x405d77b2U #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x0f8a9086U