Shader menu rework

Author: sonninnos

intl/msg_hash_lbl.h

@@ -935,12 +935,8 @@ MSG_HASH(
    "deferred_frame_time_counter_settings_list"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_REMOVE_LIST,
-   "deferred_video_shader_preset_remove_list"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_SAVE_LIST,
-   "deferred_video_shader_preset_save_list"
+   MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_MANAGER_LIST,
+   "deferred_video_shader_preset_manager_list"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_DEFERRED_CDROM_INFO_LIST,
@@ -3758,26 +3754,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_SETTINGS_TAB,
    "settings_tab"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
-   "shader_apply_changes"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES,
-   "video_shader_watch_files"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_SHADER_REMEMBER_LAST_DIR,
-   "video_shader_remember_last_dir"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_SHADER_OPTIONS,
-   "shader_options"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_SHADER_PARAMETERS_ENTRY,
-   "shader_parameters_entry"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
    "menu_show_advanced_settings"
@@ -4590,6 +4566,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_DIR,
    "video_shader_dir"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES,
+   "video_shader_watch_files"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_SHADER_REMEMBER_LAST_DIR,
+   "video_shader_remember_last_dir"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
+   "shader_apply_changes"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_SHADER_OPTIONS,
+   "shader_options"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_SHADER_PARAMETERS_ENTRY,
+   "shader_parameters_entry"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS,
    "video_shader_filter_pass"
@@ -4623,8 +4619,8 @@ MSG_HASH(
    "video_shader_preset_parameters"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_REMOVE,
-   "video_shader_preset_remove"
+   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_MANAGER,
+   "video_shader_preset_manager"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_REMOVE_GLOBAL,
@@ -4642,14 +4638,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_REMOVE_GAME,
    "video_shader_preset_remove_game"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE,
-   "video_shader_preset_save"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_REFERENCE,
    "video_shader_preset_save_reference"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CURRENT,
+   "video_shader_preset_save_current"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
    "video_shader_preset_save_as"

intl/msg_hash_us.h

@@ -10046,20 +10046,20 @@ MSG_HASH(
    "Append preset to the currently loaded preset."
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE,
-   "Save Preset"
+   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_MANAGER,
+   "Manage Presets"
    )
 MSG_HASH(
-   MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE,
-   "Save the current shader preset."
+   MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_MANAGER,
+   "Save or remove shader presets."
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_REMOVE,
-   "Remove Preset"
+   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_FILE_INFO,
+   "Active Preset File"
    )
 MSG_HASH(
-   MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_REMOVE,
-   "Remove an automatic shader preset."
+   MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_FILE_INFO,
+   "The current shader preset in use."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
@@ -10118,21 +10118,25 @@ MSG_HASH(
    "Scale for this pass. The scale factor accumulates, i.e. 2x for first pass and 2x for second pass will give you a 4x total scale.\nIf there is a scale factor for last pass, the result is stretched to screen with the default filter, depending on Bilinear Filtering setting under Video settings.\nIf 'Default' is set, either 1x scale or stretch to fullscreen will be used depending if it's not the last pass or not."
    )
 
-/* Quick Menu > Shaders > Save */
-
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_REFERENCE,
    "Simple Presets"
    )
-
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_REFERENCE,
    "Save a shader preset which has a link to the original preset loaded and includes only the parameter changes you made."
    )
-
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CURRENT,
+   "Save Current Preset"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_CURRENT,
+   "Save the current shader preset."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS,
-   "Save Shader Preset As"
+   "Save Preset As"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_AS,
@@ -10170,9 +10174,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
    "Save the current shader settings as the default settings for the content."
    )
-
-/* Quick Menu > Shaders > Remove */
-
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_PRESETS_FOUND,
    "No Automatic Shader Presets Found"

menu/cbs/menu_cbs_deferred_push.c

@@ -94,8 +94,7 @@ static int deferred_push_database_manager_list_deferred(
 GENERIC_DEFERRED_PUSH(deferred_push_remappings_port,                DISPLAYLIST_OPTIONS_REMAPPINGS_PORT)
 GENERIC_DEFERRED_PUSH(deferred_push_video_shader_preset_parameters, DISPLAYLIST_SHADER_PARAMETERS_PRESET)
 GENERIC_DEFERRED_PUSH(deferred_push_video_shader_parameters,        DISPLAYLIST_SHADER_PARAMETERS)
-GENERIC_DEFERRED_PUSH(deferred_push_video_shader_preset_save,       DISPLAYLIST_SHADER_PRESET_SAVE)
-GENERIC_DEFERRED_PUSH(deferred_push_video_shader_preset_remove,     DISPLAYLIST_SHADER_PRESET_REMOVE)
+GENERIC_DEFERRED_PUSH(deferred_push_video_shader_preset_manager,    DISPLAYLIST_SHADER_PRESET_MANAGER)
 GENERIC_DEFERRED_PUSH(deferred_push_settings,                       DISPLAYLIST_SETTINGS_ALL)
 GENERIC_DEFERRED_PUSH(deferred_push_shader_options,                 DISPLAYLIST_OPTIONS_SHADERS)
 GENERIC_DEFERRED_PUSH(deferred_push_quick_menu_override_options,    DISPLAYLIST_OPTIONS_OVERRIDES)
@@ -827,8 +826,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
       {MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST, deferred_push_accounts_youtube_list},
       {MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST, deferred_push_accounts_twitch_list},
       {MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_FACEBOOK_LIST, deferred_push_accounts_facebook_list},
-      {MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_SAVE_LIST, deferred_push_video_shader_preset_save},
-      {MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_REMOVE_LIST, deferred_push_video_shader_preset_remove},
+      {MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_MANAGER_LIST, deferred_push_video_shader_preset_manager},
       {MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_MANUAL_CONTENT_SCAN_SYSTEM_NAME, deferred_push_dropdown_box_list_manual_content_scan_system_name},
       {MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_MANUAL_CONTENT_SCAN_CORE_NAME, deferred_push_dropdown_box_list_manual_content_scan_core_name},
       {MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST, deferred_push_recording_settings_list},
@@ -871,7 +869,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
       {MENU_ENUM_LABEL_FRONTEND_COUNTERS, deferred_push_frontend_counters},
       {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS, deferred_push_video_shader_preset_parameters},
       {MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS, deferred_push_video_shader_parameters},
-      {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE, deferred_push_video_shader_preset_save},
       {MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS, deferred_push_core_cheat_options},
       {MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, deferred_push_core_input_remapping_options},
       {MENU_ENUM_LABEL_DEFERRED_REMAP_FILE_MANAGER_LIST, deferred_push_remap_file_manager},

menu/cbs/menu_cbs_get_value.c

@@ -174,6 +174,23 @@ static size_t menu_action_setting_disp_set_label_override_file_info(
    return strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len);
 }
 
+static size_t menu_action_setting_disp_set_label_shader_preset_file_info(
+      file_list_t* list,
+      unsigned *w, unsigned type, unsigned i,
+      const char *label,
+      char *s, size_t len,
+      const char *path,
+      char *s2, size_t len2)
+{
+   const char *current_path = video_shader_get_current_shader_preset();
+   *w = 19;
+   if (!string_is_empty(path))
+      strlcpy(s2, path, len2);
+   if (!string_is_empty(current_path))
+      return strlcpy(s, path_basename_nocompression(current_path), len);
+   return strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len);
+}
+
 static size_t menu_action_setting_disp_set_label_configurations(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -1891,6 +1908,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
          case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
          case MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES:
          case MENU_ENUM_LABEL_CHEAT_ADD_MATCHES:
+         case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CURRENT:
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GLOBAL:
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE:
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT:
@@ -1936,6 +1954,10 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_override_file_info);
             break;
+         case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_FILE_INFO:
+            BIND_ACTION_GET_VALUE(cbs,
+                  menu_action_setting_disp_set_label_shader_preset_file_info);
+            break;
          case MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS:
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
             BIND_ACTION_GET_VALUE(cbs,
@@ -1998,8 +2020,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PREPEND:
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_APPEND:
-         case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE:
-         case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_REMOVE:
+         case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_MANAGER:
          case MENU_ENUM_LABEL_FRONTEND_COUNTERS:
          case MENU_ENUM_LABEL_CORE_COUNTERS:
          case MENU_ENUM_LABEL_DATABASE_MANAGER_LIST:

menu/cbs/menu_cbs_left.c

@@ -1175,6 +1175,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
             break;
          case FILE_TYPE_PLAIN:
          case FILE_TYPE_DIRECTORY:
+         case FILE_TYPE_PATH:
          case FILE_TYPE_CARCHIVE:
          case FILE_TYPE_IN_CARCHIVE:
          case FILE_TYPE_CORE:

menu/cbs/menu_cbs_ok.c

@@ -511,10 +511,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl)
          return MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST;
       case ACTION_OK_DL_CDROM_INFO_DETAIL_LIST:
          return MENU_ENUM_LABEL_DEFERRED_CDROM_INFO_LIST;
-      case ACTION_OK_DL_SHADER_PRESET_SAVE:
-         return MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_SAVE_LIST;
-      case ACTION_OK_DL_SHADER_PRESET_REMOVE:
-         return MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_REMOVE_LIST;
+      case ACTION_OK_DL_SHADER_PRESET_MANAGER_LIST:
+         return MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_MANAGER_LIST;
       case ACTION_OK_DL_MANUAL_CONTENT_SCAN_LIST:
          return MENU_ENUM_LABEL_DEFERRED_MANUAL_CONTENT_SCAN_LIST;
       case ACTION_OK_DL_CORE_MANAGER_LIST:
@@ -1848,8 +1846,7 @@ int generic_action_ok_displaylist_push(
 #ifdef HAVE_LAKKA
       case ACTION_OK_DL_EJECT_DISC:
 #endif
-      case ACTION_OK_DL_SHADER_PRESET_REMOVE:
-      case ACTION_OK_DL_SHADER_PRESET_SAVE:
+      case ACTION_OK_DL_SHADER_PRESET_MANAGER_LIST:
       case ACTION_OK_DL_CDROM_INFO_LIST:
       case ACTION_OK_DL_MANUAL_CONTENT_SCAN_LIST:
       case ACTION_OK_DL_CORE_MANAGER_LIST:
@@ -3428,7 +3425,8 @@ DEFAULT_ACTION_DIALOG_START(action_ok_shader_preset_save_as,
 
 enum
 {
-   ACTION_OK_SHADER_PRESET_SAVE_GLOBAL = 0,
+   ACTION_OK_SHADER_PRESET_SAVE_CURRENT = 0,
+   ACTION_OK_SHADER_PRESET_SAVE_GLOBAL,
    ACTION_OK_SHADER_PRESET_SAVE_CORE,
    ACTION_OK_SHADER_PRESET_SAVE_PARENT,
    ACTION_OK_SHADER_PRESET_SAVE_GAME
@@ -3499,6 +3497,9 @@ static int generic_action_ok_shader_preset_save(const char *path,
 
    switch (action_type)
    {
+      case ACTION_OK_SHADER_PRESET_SAVE_CURRENT:
+         preset_type = SHADER_PRESET_CURRENT;
+         break;
       case ACTION_OK_SHADER_PRESET_SAVE_GLOBAL:
          preset_type = SHADER_PRESET_GLOBAL;
          break;
@@ -3538,6 +3539,13 @@ static int generic_action_ok_shader_preset_save(const char *path,
    return 0;
 }
 
+static int action_ok_shader_preset_save_current(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   return generic_action_ok_shader_preset_save(path, label, type,
+         idx, entry_idx, ACTION_OK_SHADER_PRESET_SAVE_CURRENT);
+}
+
 static int action_ok_shader_preset_save_global(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
@@ -6461,8 +6469,7 @@ STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_goto_music, ACTION_OK_DL_MUSIC_LIST)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_goto_explore, ACTION_OK_DL_EXPLORE_LIST)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_goto_contentless_cores, ACTION_OK_DL_CONTENTLESS_CORES_LIST)
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
-STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_shader_preset_save, ACTION_OK_DL_SHADER_PRESET_SAVE)
-STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_shader_preset_remove, ACTION_OK_DL_SHADER_PRESET_REMOVE)
+STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_shader_preset_manager, ACTION_OK_DL_SHADER_PRESET_MANAGER_LIST)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_shader_parameters, ACTION_OK_DL_SHADER_PARAMETERS)
 #endif
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_parent_directory_push, ACTION_OK_DL_PARENT_DIRECTORY_PUSH)
@@ -9005,8 +9012,8 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          {MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,             action_ok_shader_parameters},
          {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS,      action_ok_shader_parameters},
          {MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,                action_ok_shader_apply_changes},
-         {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_REMOVE,          action_ok_shader_preset_remove},
-         {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE,            action_ok_shader_preset_save},
+         {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_MANAGER,         action_ok_shader_preset_manager},
+         {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CURRENT,    action_ok_shader_preset_save_current},
          {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,         action_ok_shader_preset_save_as},
          {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GLOBAL,     action_ok_shader_preset_save_global},
          {MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,       action_ok_shader_preset_save_core},

menu/cbs/menu_cbs_right.c

@@ -1028,6 +1028,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
             break;
          case FILE_TYPE_PLAIN:
          case FILE_TYPE_DIRECTORY:
+         case FILE_TYPE_PATH:
          case FILE_TYPE_PARENT_DIRECTORY:
          case FILE_TYPE_CARCHIVE:
          case FILE_TYPE_IN_CARCHIVE: