Add easy way to enable/disable shaders

intl/msg_hash_ar.h

@@ -3750,3 +3750,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_chs.h

@@ -4764,3 +4764,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_cht.h

@@ -3522,3 +3522,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_de.h

@@ -3651,3 +3651,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_el.h

@@ -7728,3 +7728,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_eo.h

@@ -3410,3 +3410,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_es.h

@@ -7880,3 +7880,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_fr.h

@@ -8657,3 +8657,5 @@ MSG_HASH(
          MENU_ENUM_SUBLABEL_LOG_DIR,
          "Les fichiers de journalisation des événements système seront conservés dans ce dossier."
          )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_it.h

@@ -3635,3 +3635,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_ja.h

@@ -4204,3 +4204,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_ko.h

@@ -3503,3 +3503,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_lbl.h

@@ -1841,3 +1841,5 @@ MSG_HASH(MENU_ENUM_LABEL_LOG_DIR,
       "log_dir")
 MSG_HASH(MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE,
       "menu_widgets_enable")
+MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
+      "video_shader_enable")

intl/msg_hash_nl.h

@@ -3404,3 +3404,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_pl.h

@@ -3800,3 +3800,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu widgetów")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_pt_br.h

@@ -8032,3 +8032,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_pt_pt.h

@@ -3476,3 +3476,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_ru.h

@@ -3679,3 +3679,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_tr.h

@@ -8548,3 +8548,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_us.h

@@ -8663,3 +8663,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

intl/msg_hash_vn.h

@@ -3566,3 +3566,5 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
       "Menu Widgets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+      "Video Shaders")

menu/menu_displaylist.c

@@ -4718,95 +4718,104 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             unsigned i;
             struct video_shader *shader = menu_shader_get();
             unsigned pass_count         = shader ? shader->passes : 0;
+            settings_t      *settings   = config_get_ptr();
 
-            if (menu_entries_append_enum(info->list,
+            if (menu_displaylist_parse_settings_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES),
+                  MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
-                  msg_hash_to_str(MENU_ENUM_LABEL_SHADER_APPLY_CHANGES),
+                  PARSE_ONLY_BOOL, false) == 0)
-                  MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
-                  MENU_SETTING_ACTION, 0, 0))
                count++;
 
-            if (frontend_driver_can_watch_for_changes())
+            if (settings->bools.video_shader_enable)
             {
                if (menu_entries_append_enum(info->list,
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_WATCH_FOR_CHANGES),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES),
-                     msg_hash_to_str(MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES),
+                        msg_hash_to_str(MENU_ENUM_LABEL_SHADER_APPLY_CHANGES),
-                     MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES,
+                        MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
-                     0, 0, 0))
+                        MENU_SETTING_ACTION, 0, 0))
-                  count++;
-            }
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
-                  FILE_TYPE_PATH, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
-                  MENU_SETTING_ACTION, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
-                  MENU_SETTING_ACTION, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_PARENT),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT,
-                  MENU_SETTING_ACTION, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
-                  MENU_SETTING_ACTION, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
-                  MENU_SETTING_ACTION, 0, 0))
-               count++;
-            if (menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES),
-                  MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES,
-                  0, 0, 0))
-               count++;
-
-            for (i = 0; i < pass_count; i++)
-            {
-               char buf_tmp[64];
-               char buf[128];
-
-               buf[0] = buf_tmp[0] = '\0';
-
-               snprintf(buf_tmp, sizeof(buf_tmp),
-                     "%s #%u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER), i);
-
-               if (menu_entries_append_enum(info->list, buf_tmp,
-                     msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PASS),
-                     MENU_ENUM_LABEL_VIDEO_SHADER_PASS,
-                     MENU_SETTINGS_SHADER_PASS_0 + i, 0, 0))
                   count++;
 
-               snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FILTER));
+               if (frontend_driver_can_watch_for_changes())
-               if (menu_entries_append_enum(info->list, buf,
+               {
-                     msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS),
+                  if (menu_entries_append_enum(info->list,
-                     MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS,
+                           msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_WATCH_FOR_CHANGES),
-                     MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0, 0))
+                           msg_hash_to_str(MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES),
+                           MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES,
+                           0, 0, 0))
+                     count++;
+               }
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
+                        FILE_TYPE_PATH, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
+                        MENU_SETTING_ACTION, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
+                        MENU_SETTING_ACTION, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_PARENT),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT,
+                        MENU_SETTING_ACTION, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
+                        MENU_SETTING_ACTION, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
+                        MENU_SETTING_ACTION, 0, 0))
+                  count++;
+               if (menu_entries_append_enum(info->list,
+                        msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES),
+                        msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES),
+                        MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES,
+                        0, 0, 0))
                   count++;
 
-               snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCALE));
+               for (i = 0; i < pass_count; i++)
-               if (menu_entries_append_enum(info->list, buf,
+               {
-                     msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS),
+                  char buf_tmp[64];
-                     MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS,
+                  char buf[128];
-                     MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0, 0))
+
-                  count++;
+                  buf[0] = buf_tmp[0] = '\0';
+
+                  snprintf(buf_tmp, sizeof(buf_tmp),
+                        "%s #%u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER), i);
+
+                  if (menu_entries_append_enum(info->list, buf_tmp,
+                           msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PASS),
+                           MENU_ENUM_LABEL_VIDEO_SHADER_PASS,
+                           MENU_SETTINGS_SHADER_PASS_0 + i, 0, 0))
+                     count++;
+
+                  snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FILTER));
+                  if (menu_entries_append_enum(info->list, buf,
+                           msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS),
+                           MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS,
+                           MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0, 0))
+                     count++;
+
+                  snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCALE));
+                  if (menu_entries_append_enum(info->list, buf,
+                           msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS),
+                           MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS,
+                           MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0, 0))
+                     count++;
+               }
             }
          }
 

menu/menu_setting.c

@@ -62,6 +62,7 @@
 #include "menu_driver.h"
 #include "menu_animation.h"
 #include "menu_input.h"
+#include "menu_shader.h"
 #include "widgets/menu_input_dialog.h"
 #include "widgets/menu_input_bind_dialog.h"
 
@@ -5574,6 +5575,28 @@ void general_write_handler(rarch_setting_t *setting)
 
    switch (setting->enum_idx)
    {
+      case MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE:
+         {
+            if (*setting->value.target.boolean)
+            {
+               bool refresh                = false;
+               menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
+               menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
+            }
+            else if (!*setting->value.target.boolean)
+            {
+               bool refresh                = false;
+               settings_t *settings        = config_get_ptr();
+               struct video_shader *shader = menu_shader_get();
+
+               shader->passes = 0;
+
+               menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
+               menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
+               command_event(CMD_EVENT_SHADERS_APPLY_CHANGES, NULL);
+               settings->bools.video_shader_enable = false;
+            }
+         }
       case MENU_ENUM_LABEL_VIDEO_THREADED:
          {
             if (*setting->value.target.boolean)
@@ -7276,6 +7299,21 @@ static bool setting_append_list(
                      bool_entries[i].flags);
             }
 
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.video_shader_enable,
+                  MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
+                  shader_enable,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
+
             END_SUB_GROUP(list, list_info, parent_group);
             END_GROUP(list, list_info, parent_group);
          }

msg_hash.h

@@ -561,6 +561,8 @@ enum msg_hash_enums
    MENU_LABEL(SHADER_PIPELINE_BOKEH),
    MENU_LABEL(SHADER_PIPELINE_SNOWFLAKE),
 
+   MENU_LABEL(VIDEO_SHADERS_ENABLE),
+
    MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY),
    MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY),
    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,