retroarch: no global_t

PAL60 is a PS3 setting, video_pal60_enable, in effect when the output is 720x576; the state flags that stood in for it go. The error jump buffer, its message and the launch flags live in retroarch.c's own state, with the flags among RARCH_FLAGS_*. config_load() and the menu's setting builders lose the global they no longer use.
2026-11-07 08:36:02 -10:00 · 2026-10-03 22:21:47 +02:00
1 parent 07207e294d
commit 3a11efc366
@@ -147,12 +147,6 @@ static void *ps3_audio_init(const char *device,
   params.numChannels                = channels;
   params.numBlocks                  = AUDIO_BLOCKS;
   params.param_attrib               = 0;
-#if 0
-#ifdef HAVE_HEADSET
-   if (global->console.sound.mode == SOUND_MODE_HEADSET)
-      params.param_attrib            = CELL_AUDIO_PORTATTR_OUT_SECONDARY;
-#endif
-#endif

   if (audioPortOpen(&params, &data->audio_port) != CELL_OK)
   {
@@ -251,6 +251,9 @@
 * video trap filter). */
 #define DEFAULT_SOFT_FILTER false

+/* PS3: 720x576 output converted to 60 Hz. */
+#define DEFAULT_PAL60_ENABLE false
+
 /* Xbox: flicker filter strength, 0 (off) to 5. */
 #define DEFAULT_FLICKER_FILTER 0

@@ -1016,7 +1016,7 @@ struct config_path_setting

 /* Forward declarations */
 #ifdef HAVE_CONFIGFILE
-static void config_parse_file(global_t *global);
+static void config_parse_file(void);
 static size_t config_get_credentials_path(char *s, size_t len);
 static bool config_save_credentials(
      config_file_t *main_conf,
@@ -2827,6 +2827,9 @@ static struct config_bool_setting *populate_settings_bool(
 #undef S_UINT_AT_EX_NS_H
   SETTING_BOOL("video_scanline_sync",           &settings->bools.video_scanline_sync, true, DEFAULT_SCANLINE_SYNC, false);
   SETTING_BOOL("video_notch_write_over_enable", &settings->bools.video_notch_write_over_enable, true, DEFAULT_NOTCH_WRITE_OVER_ENABLE, false);
+#ifdef HAVE_PSGL
+   SETTING_BOOL("pal60_enable",                  &settings->bools.video_pal60_enable, true, DEFAULT_PAL60_ENABLE, false);
+#endif
 #if defined(_XBOX1) || defined(HW_RVL)
   SETTING_BOOL("soft_filter_enable",            &settings->bools.video_soft_filter, true, DEFAULT_SOFT_FILTER, false);
 #endif
@@ -6325,12 +6328,11 @@ void config_set_defaults(settings_t *target)
 * Loads a config file and reads all the values into memory.
 *
 */
-void config_load(void *data)
+void config_load(void)
 {
-   global_t *global = (global_t*)data;
   config_set_defaults(config_st);
 #ifdef HAVE_CONFIGFILE
-   config_parse_file(global);
+   config_parse_file();
 #endif
 }

@@ -6633,8 +6635,7 @@ static void config_sanitize_turbo_binds(settings_t *settings)
 * Loads a config file and reads all the values into memory.
 *
 */
-static bool config_load_file(global_t *global,
-      const char *path, settings_t *settings)
+static bool config_load_file(const char *path, settings_t *settings)
 {
   unsigned i;
   char tmp_str[PATH_MAX_LENGTH];
@@ -7799,7 +7800,7 @@ bool config_load_override(void *data)
   retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
   retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);

-   if (!config_load_file(global_get_ptr(), path_get(RARCH_PATH_CONFIG), settings))
+   if (!config_load_file(path_get(RARCH_PATH_CONFIG), settings))
      return false;

   a = path_get(RARCH_PATH_CONFIG_OVERRIDE);
@@ -7844,7 +7845,7 @@ bool config_load_override_file(const char *config_path)
   retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
   retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);

-   if (!config_load_file(global_get_ptr(), path_get(RARCH_PATH_CONFIG), settings))
+   if (!config_load_file(path_get(RARCH_PATH_CONFIG), settings))
      return false;

   if (settings->bools.notification_show_config_override_load)
@@ -7984,7 +7985,7 @@ bool config_unload_override(void)
         input_autoconf_state_restore(&bkp);
   }

-   if (!config_load_file(global_get_ptr(),
+   if (!config_load_file(
            path_get(RARCH_PATH_CONFIG), config_st))
      return false;

@@ -8169,11 +8170,11 @@ success:
 * Loads a config file and reads all the values into memory.
 *
 */
-static void config_parse_file(global_t *global)
+static void config_parse_file(void)
 {
   const char *config_path = path_get(RARCH_PATH_CONFIG);

-   if (!config_load_file(global, config_path, config_st))
+   if (!config_load_file(config_path, config_st))
   {
      RARCH_ERR("[Config] Config not found at: \"%s\".\n",
            config_path);
@@ -9822,7 +9823,7 @@ int8_t config_save_overrides(enum override_type type,
   memcpy(input_override_binds, input_config_binds, sizeof(input_config_binds));

   /* Load the original config file in memory */
-   config_load_file(global_get_ptr(),
+   config_load_file(
         "without-overrides", settings);

   bool_settings       = populate_settings_bool(settings,   &bool_settings_size);
@@ -628,6 +628,7 @@ typedef struct settings
      bool video_waitable_swapchains;
      bool video_vfilter;
      bool video_soft_filter;
+      bool video_pal60_enable;
      bool video_smooth;
      bool video_ctx_scaling;
      bool video_force_aspect;
@@ -1614,7 +1615,7 @@ bool config_metal_arg_buffers_default(void);

 void config_set_defaults(settings_t *target);

-void config_load(void *data);
+void config_load(void);

 #if !defined(HAVE_DYNAMIC)
 /* Salamander config file contains a single
@@ -44,7 +44,6 @@ typedef CellVideoOutState ps3_video_state_t;
 #include "dispserv_ps3.h"
 #include "../../command.h"
 #include "../../configuration.h"
-#include "../../retroarch.h"
 #include "../../verbosity.h"

 /* Nothing to keep; any non-NULL pointer marks the server as up */
@@ -121,7 +120,6 @@ static bool ps3_display_server_set_resolution(void *data,
   int id;
   bool in_use;
   settings_t *settings = config_get_ptr();
-   global_t *global     = global_get_ptr();

   /* No dims is a refresh rate change on its own, which the video
    * output cannot make without changing the mode */
@@ -143,13 +141,6 @@ static bool ps3_display_server_set_resolution(void *data,
   if (in_use)
      return true;

-   /* PAL60 temporal conversion only applies to 576 (PSGL) */
-   if (dims != VIDEO_SCALE_PACK(720, 576))
-   {
-      global->console.screen.pal_enable   = false;
-      global->console.screen.pal60_enable = false;
-   }
-
   /* The output is configured at video init, with the frame buffers
    * sized for it */
   command_event(CMD_EVENT_REINIT, NULL);
@@ -120,7 +120,6 @@ static void *gfx_ctx_ps3_init(void *video_driver)
   PSGLinitOptions options;
   unsigned dims;
 #endif
-   global_t        *global  = global_get_ptr();
   gfx_ctx_ps3_data_t *ps3  = (gfx_ctx_ps3_data_t*)
      calloc(1, sizeof(gfx_ctx_ps3_data_t));

@@ -151,17 +150,11 @@ static void *gfx_ctx_ps3_init(void *video_driver)
      params.enable        |= PSGL_DEVICE_PARAMETERS_WIDTH_HEIGHT;
      params.width          = VIDEO_SCALE_W(dims);
      params.height         = VIDEO_SCALE_H(dims);
-
-      global->console.screen.pal_enable = false;
-
-      if (params.width == 720 && params.height == 576)
-      {
-         RARCH_LOG("[PSGL Context] 720x576 resolution detected, setting MODE_VIDEO_PAL_ENABLE.\n");
-         global->console.screen.pal_enable = true;
-      }
   }

-   if (global->console.screen.pal60_enable)
+   /* PAL60 converts 720x576 output only */
+   if (     dims == VIDEO_SCALE_PACK(720, 576)
+         && config_get_ptr()->bools.video_pal60_enable)
   {
      RARCH_LOG("[PSGL Context] Setting temporal PAL60 mode.\n");
      params.enable             |= PSGL_DEVICE_PARAMETERS_RESC_PAL_TEMPORAL_MODE;
@@ -176,11 +169,6 @@ static void *gfx_ctx_ps3_init(void *video_driver)
   psglResetCurrentContext();
 #endif

-   global->console.screen.pal_enable =
-      cellVideoOutGetResolutionAvailability(
-            CELL_VIDEO_OUT_PRIMARY, CELL_VIDEO_OUT_RESOLUTION_576,
-            CELL_VIDEO_OUT_ASPECT_AUTO, 0);
-
   return ps3;
 }

@@ -1824,10 +1824,6 @@ MSG_HASH(
   MENU_ENUM_LABEL_OSK_OVERLAY_PRESET,
   MENU_ENUM_LABEL_OSK_OVERLAY_PRESET_STR
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_PAL60_ENABLE,
-   MENU_ENUM_LABEL_PAL60_ENABLE_STR
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_PARENT_DIRECTORY,
   MENU_ENUM_LABEL_PARENT_DIRECTORY_STR
@@ -34591,10 +34591,6 @@ MSG_HASH(
   MENU_ENUM_LABEL_HELP_GAMEMODE_ENABLE,
   "Enabling Linux GameMode can improve latency, fix audio crackling issues and maximize overall performance by automatically configuring your CPU and GPU for best performance.\nThe GameMode software needs to be installed for this to work. See https://github.com/FeralInteractive/gamemode for information on how to install GameMode."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
-   "Use PAL60 Mode"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
   "Restart RetroArch"
@@ -8416,7 +8416,7 @@ static const enum settings_list_type settings_list_build_order[] =
      SETTINGS_LIST_MANUAL_CONTENT_SCAN
   };

-static bool setting_append_list(settings_t *settings, global_t *global,
+static bool setting_append_list(settings_t *settings,
      enum settings_list_type type, rarch_setting_t **list,
      rarch_setting_info_t *list_info, const char *parent_group);

@@ -9966,13 +9966,21 @@ static void general_write_handler(rarch_setting_t *setting)
         break;
 #endif
      case MENU_ENUM_LABEL_PAL60_ENABLE:
-         if (*setting->value.target.boolean && global_get_ptr()->console.screen.pal_enable)
-            rarch_cmd = CMD_EVENT_REINIT;
-         else
         {
-            *setting->value.target.boolean = false;
-            if (setting->actions->change)
-               setting->actions->change(setting);
+            /* Only 720x576 output converts */
+            unsigned dims = 0;
+            char desc[64];
+            if (     *setting->value.target.boolean
+                  && video_driver_get_video_output_size(&dims, desc,
+                     sizeof(desc))
+                  && dims == VIDEO_SCALE_PACK(720, 576))
+               rarch_cmd = CMD_EVENT_REINIT;
+            else
+            {
+               *setting->value.target.boolean = false;
+               if (setting->actions->change)
+                  setting->actions->change(setting);
+            }
         }
         break;
      case MENU_ENUM_LABEL_SYSTEM_BGM_ENABLE:
@@ -12037,7 +12045,7 @@ static const setting_desc_t vid_desc_1[] = {
 #include "../settings/settings_def_video_monitor_index.h"
 };

-#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360)
+#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360) || defined(HAVE_PSGL)
 static const setting_desc_t vid_console_desc[] = {
 /* GENERATED: rows come from settings_def_video_console_screen.h in order. */
 #include "../settings/settings_def_video_console_screen.h"
@@ -13455,7 +13463,7 @@ static const setting_desc_t smbclient_desc_1[] = {
 * registry entry. */

 static void settings_build_main_menu(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -13464,7 +13472,7 @@ static void settings_build_main_menu(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info, MENU_ENUM_LABEL_MAIN_MENU_STR, parent_group);
      MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, MENU_ENUM_LABEL_MAIN_MENU);
@@ -13595,7 +13603,7 @@ static void settings_build_main_menu(
 }

 static void settings_build_drivers(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -13603,7 +13611,7 @@ static void settings_build_drivers(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         unsigned i, j = 0;
@@ -13809,7 +13817,7 @@ static void settings_build_drivers(
 }

 static void settings_build_core(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -13817,7 +13825,7 @@ static void settings_build_core(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         unsigned i, listing = 0;
@@ -13950,7 +13958,7 @@ static void settings_build_core(
 }

 static void settings_build_configuration(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -13958,7 +13966,7 @@ static void settings_build_configuration(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         uint8_t i, listing = 0;
@@ -14078,7 +14086,7 @@ static void settings_build_configuration(
 }

 static void settings_build_logging(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14086,7 +14094,7 @@ static void settings_build_logging(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         bool *tmp_b = NULL;
@@ -14149,7 +14157,7 @@ ADD_DESC(logging_desc_0);
 }

 static void settings_build_saving(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14157,7 +14165,7 @@ static void settings_build_saving(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         uint8_t i, listing = 0;
@@ -14291,7 +14299,7 @@ static void settings_build_saving(
 }

 static void settings_build_cloud_sync(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14299,7 +14307,7 @@ static void settings_build_cloud_sync(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CLOUDSYNC
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SETTINGS, MENU_ENUM_LABEL_CLOUD_SYNC_SETTINGS);
@@ -14337,7 +14345,7 @@ static void settings_build_cloud_sync(


 static void settings_build_rewind(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14345,7 +14353,7 @@ static void settings_build_rewind(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS), parent_group);

@@ -14379,7 +14387,7 @@ static void settings_build_rewind(


 static void settings_build_cheat_details(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14387,7 +14395,7 @@ static void settings_build_cheat_details(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CHEATS
      {
@@ -14647,7 +14655,7 @@ static void settings_build_cheat_details(
 }

 static void settings_build_cheat_search(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14655,7 +14663,7 @@ static void settings_build_cheat_search(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CHEATS
      if (!cheat_manager_state.cheats)
@@ -14883,7 +14891,7 @@ static void settings_build_cheat_search(
 }

 static void settings_build_video(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -14891,7 +14899,7 @@ static void settings_build_video(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         START_GROUP(list, list_info, &group_info,
@@ -14910,7 +14918,7 @@ static void settings_build_video(
         START_SUB_GROUP(list, list_info, "Platform-specific", &group_info,
               &subgroup_info, parent_group);

-#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360)
+#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360) || defined(HAVE_PSGL)
            ADD_DESC(vid_console_desc);
 #endif

@@ -15291,7 +15299,7 @@ static void settings_build_video(


 static void settings_build_audio(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15299,7 +15307,7 @@ static void settings_build_audio(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS), parent_group);
@@ -15416,7 +15424,7 @@ ADD_DESC(audio_skew_desc);

 #ifdef HAVE_MICROPHONE
 static void settings_build_microphone(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15424,7 +15432,7 @@ static void settings_build_microphone(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MICROPHONE_SETTINGS), parent_group);
@@ -15473,7 +15481,7 @@ static void settings_build_microphone(
 #endif

 static void settings_build_input(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15481,7 +15489,7 @@ static void settings_build_input(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {


@@ -15730,7 +15738,7 @@ static void settings_build_input(


 static void settings_build_recording(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15739,7 +15747,7 @@ static void settings_build_recording(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
         GROUP_STATE(MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS, MENU_ENUM_LABEL_RECORDING_SETTINGS);

@@ -15813,7 +15821,7 @@ static void settings_build_recording(
 }

 static void settings_build_input_hotkey(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15821,7 +15829,7 @@ static void settings_build_input_hotkey(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         unsigned i;
@@ -15862,7 +15870,7 @@ static void settings_build_input_hotkey(
 }

 static void settings_build_frame_throttling(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15870,7 +15878,7 @@ static void settings_build_frame_throttling(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS);

@@ -15931,7 +15939,7 @@ ADD_DESC(frame_throttli_desc_2);
 }

 static void settings_build_onscreen_notifications(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15939,7 +15947,7 @@ static void settings_build_onscreen_notifications(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS),
@@ -15987,7 +15995,7 @@ static void settings_build_onscreen_notifications(
 }

 static void settings_build_overlay(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -15995,7 +16003,7 @@ static void settings_build_overlay(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_OVERLAY
      START_GROUP(list, list_info, &group_info,
@@ -16051,7 +16059,7 @@ static void settings_build_overlay(
 }

 static void settings_build_osk_overlay(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16059,7 +16067,7 @@ static void settings_build_osk_overlay(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_OVERLAY
      START_GROUP(list, list_info, &group_info,
@@ -16080,7 +16088,7 @@ static void settings_build_osk_overlay(


 static void settings_build_menu(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16088,7 +16096,7 @@ static void settings_build_menu(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS),
@@ -16430,7 +16438,7 @@ static void settings_build_menu(


 static void settings_build_power_management(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16438,7 +16446,7 @@ static void settings_build_power_management(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS);

@@ -16461,7 +16469,7 @@ static void settings_build_power_management(


 static void settings_build_ai_service(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16469,7 +16477,7 @@ static void settings_build_ai_service(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_TRANSLATE
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_AI_SERVICE_SETTINGS, MENU_ENUM_LABEL_AI_SERVICE_SETTINGS);
@@ -16519,7 +16527,7 @@ static void settings_build_ai_service(
 }

 static void settings_build_user_interface(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16527,7 +16535,7 @@ static void settings_build_user_interface(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS);

@@ -16669,7 +16677,7 @@ ADD_DESC(ui_desc_13);
 }

 static void settings_build_playlist(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16677,7 +16685,7 @@ static void settings_build_playlist(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN_STR,
@@ -16722,7 +16730,7 @@ static void settings_build_playlist(
 }

 static void settings_build_cheevos(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16730,7 +16738,7 @@ static void settings_build_cheevos(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CHEEVOS
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS, MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS);
@@ -16780,7 +16788,7 @@ static void settings_build_cheevos(
 }

 static void settings_build_cheevos_appearance(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16788,7 +16796,7 @@ static void settings_build_cheevos_appearance(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CHEEVOS
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_CHEEVOS_APPEARANCE_SETTINGS, MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_SETTINGS);
@@ -16868,7 +16876,7 @@ static void settings_build_cheevos_appearance(
 }

 static void settings_build_cheevos_visibility(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16876,7 +16884,7 @@ static void settings_build_cheevos_visibility(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
 #ifdef HAVE_CHEEVOS
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_CHEEVOS_VISIBILITY_SETTINGS, MENU_ENUM_LABEL_CHEEVOS_VISIBILITY_SETTINGS);
@@ -16908,7 +16916,7 @@ static void settings_build_cheevos_visibility(
 }

 static void settings_build_core_updater(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -16916,7 +16924,7 @@ static void settings_build_core_updater(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS, MENU_ENUM_LABEL_UPDATER_SETTINGS);
 #ifdef HAVE_NETWORKING
@@ -17001,7 +17009,7 @@ static void settings_build_core_updater(
 }

 static void settings_build_netplay(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17009,7 +17017,7 @@ static void settings_build_netplay(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS),
@@ -17212,7 +17220,7 @@ static void settings_build_netplay(
 }

 static void settings_build_lakka_services(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17220,7 +17228,7 @@ static void settings_build_lakka_services(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

 #if defined(HAVE_LAKKA)
@@ -17344,7 +17352,7 @@ static void settings_build_lakka_services(

 #ifdef HAVE_LAKKA_SWITCH
 static void settings_build_lakka_switch_options(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17352,7 +17360,7 @@ static void settings_build_lakka_switch_options(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {

         START_GROUP(list, list_info, &group_info,
@@ -17419,7 +17427,7 @@ static void settings_build_lakka_switch_options(
 #endif

 static void settings_build_user(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17427,7 +17435,7 @@ static void settings_build_user(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_USER_SETTINGS, MENU_ENUM_LABEL_USER_SETTINGS);

@@ -17472,7 +17480,7 @@ static void settings_build_user(
 }

 static void settings_build_user_accounts(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17480,7 +17488,7 @@ static void settings_build_user_accounts(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END, MENU_ENUM_LABEL_SETTINGS);

@@ -17497,7 +17505,7 @@ static void settings_build_user_accounts(
 }

 static void settings_build_user_accounts_youtube(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17505,7 +17513,7 @@ static void settings_build_user_accounts_youtube(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, MENU_ENUM_LABEL_SETTINGS);

@@ -17531,7 +17539,7 @@ static void settings_build_user_accounts_youtube(
 }

 static void settings_build_user_accounts_twitch(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17539,7 +17547,7 @@ static void settings_build_user_accounts_twitch(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, MENU_ENUM_LABEL_SETTINGS);

@@ -17564,7 +17572,7 @@ static void settings_build_user_accounts_twitch(
 }

 static void settings_build_user_accounts_facebook(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17572,7 +17580,7 @@ static void settings_build_user_accounts_facebook(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_ACCOUNTS_FACEBOOK, MENU_ENUM_LABEL_SETTINGS);

@@ -17597,7 +17605,7 @@ static void settings_build_user_accounts_facebook(
 }

 static void settings_build_user_accounts_kick(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17605,7 +17613,7 @@ static void settings_build_user_accounts_kick(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_ACCOUNTS_KICK, MENU_ENUM_LABEL_SETTINGS);

@@ -17631,7 +17639,7 @@ static void settings_build_user_accounts_kick(


 static void settings_build_directory(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17640,7 +17648,7 @@ static void settings_build_directory(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS),
@@ -17727,7 +17735,7 @@ static void settings_build_directory(
 }

 static void settings_build_privacy(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17735,7 +17743,7 @@ static void settings_build_privacy(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS), parent_group);
@@ -17763,7 +17771,7 @@ static void settings_build_privacy(
 }

 static void settings_build_midi(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17771,7 +17779,7 @@ static void settings_build_midi(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MIDI_SETTINGS), parent_group);
@@ -17792,7 +17800,7 @@ static void settings_build_midi(
 }

 static void settings_build_manual_content_scan(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17800,7 +17808,7 @@ static void settings_build_manual_content_scan(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      START_GROUP(list, list_info, &group_info,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MANUAL_CONTENT_SCAN_LIST), parent_group);
@@ -17974,7 +17982,7 @@ static void settings_build_manual_content_scan(

 #ifdef HAVE_SMBCLIENT
 static void settings_build_smbclient(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -17982,7 +17990,7 @@ static void settings_build_smbclient(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)settings; (void)global; (void)group_info; (void)subgroup_info;
+   (void)settings; (void)group_info; (void)subgroup_info;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_SMB_CLIENT_SETTINGS, MENU_ENUM_LABEL_SMB_CLIENT_SETTINGS);

@@ -18099,7 +18107,7 @@ static void settings_build_smbclient(
 /* Descriptor holdouts: the strings take free input, the uints are
 * plain ranges. */
 static void settings_build_nfsclient(
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -18107,7 +18115,6 @@ static void settings_build_nfsclient(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)global;
   {
      GROUP_STATE(MENU_ENUM_LABEL_VALUE_NFS_CLIENT_SETTINGS, MENU_ENUM_LABEL_NFS_CLIENT_SETTINGS);
      NFS_STRING(nfs_server, NFS_CLIENT_SERVER);
@@ -18132,7 +18139,7 @@ static void settings_build_nfsclient(
 typedef struct settings_build_entry
 {
   enum settings_list_type type;
-   void (*build)(settings_t *settings, global_t *global,
+   void (*build)(settings_t *settings,
         rarch_setting_t **list, rarch_setting_info_t *list_info,
         const char *parent_group);
   /* Data-driven groups: when build is NULL the generic builder runs
@@ -18146,7 +18153,7 @@ typedef struct settings_build_entry

 static void settings_build_desc_group(
      const settings_build_entry_t *e,
-      settings_t *settings, global_t *global,
+      settings_t *settings,
      rarch_setting_t **list, rarch_setting_info_t *list_info,
      const char *parent_group)
 {
@@ -18154,7 +18161,6 @@ static void settings_build_desc_group(
   rarch_setting_group_info_t subgroup_info;
   group_info.name    = NULL;
   subgroup_info.name = NULL;
-   (void)global;
   START_GROUP(list, list_info, &group_info,
         msg_hash_to_str(e->value_label), parent_group);
   if (e->idx_label)
@@ -18302,7 +18308,6 @@ static const settings_build_entry_t settings_build_registry[] = {

 static bool setting_append_list(
      settings_t *settings,
-      global_t *global,
      enum settings_list_type type,
      rarch_setting_t **list,
      rarch_setting_info_t *list_info,
@@ -18314,11 +18319,11 @@ static bool setting_append_list(
      if (settings_build_registry[i].type != type)
         continue;
      if (settings_build_registry[i].build)
-         settings_build_registry[i].build(settings, global,
+         settings_build_registry[i].build(settings,
               list, list_info, parent_group);
      else
         settings_build_desc_group(&settings_build_registry[i],
-               settings, global, list, list_info, parent_group);
+               settings, list, list_info, parent_group);
      return true;
   }
   return true;
@@ -18394,7 +18399,6 @@ void menu_setting_free(rarch_setting_t *setting)
 static rarch_setting_t *settings_lazy_get(unsigned k)
 {
   settings_t *settings = config_get_ptr();
-   global_t *global     = global_get_ptr();
   rarch_setting_t *sl       = NULL;
   rarch_setting_t **lp      = NULL;
   rarch_setting_info_t li;
@@ -18412,7 +18416,7 @@ static rarch_setting_t *settings_lazy_get(unsigned k)
   {
      MENU_SETTING_INITIALIZE((&sl)[0], j);
   }
-   if (!setting_append_list(settings, global,
+   if (!setting_append_list(settings,
         settings_list_build_order[k], &sl, &li,
         MENU_ENUM_LABEL_MAIN_MENU_STR))
   {
@@ -18512,7 +18516,7 @@ static const settings_desc_table_t settings_desc_registry[] = {
   { vid_desc_0, (uint16_t)ARRAY_SIZE(vid_desc_0) },
 #endif
   { vid_desc_1, (uint16_t)ARRAY_SIZE(vid_desc_1) },
-#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360)
+#if defined(GEKKO) || defined(_XBOX1) || defined(_XBOX360) || defined(HAVE_PSGL)
   { vid_console_desc, (uint16_t)ARRAY_SIZE(vid_console_desc) },
 #endif
 #if defined(ANDROID) || TARGET_OS_IOS
@@ -18998,7 +19002,6 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf
   unsigned i;
   rarch_setting_t* resized_list        = NULL;
      settings_t *settings                 = config_get_ptr();
-   global_t   *global                   = global_get_ptr();
   const char *root                     = NULL;
   rarch_setting_t **list_ptr           = NULL;
   rarch_setting_t *list                = (rarch_setting_t*)
@@ -19017,7 +19020,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf
   for (i = 0; i < ARRAY_SIZE(settings_list_build_order); i++)
   {
      if (!setting_append_list(
-               settings, global,
+               settings,
               settings_list_build_order[i], &list, list_info, root))
      {
         free(list);
@@ -27856,7 +27856,6 @@ enum msg_hash_enums
 #undef SETTINGS_DEF_ENUM_PASS
   MENU_ENUM_LABEL_HELP_VIDEO_FILTER_BUILTIN,
   MENU_LABEL(VIDEO_FILTER_REMOVE),
-   MENU_LABEL(PAL60_ENABLE),


   /* GENERATED REGION: user directories group enum rows (see settings/settings_def_dir_user.h). */
@@ -51,6 +51,7 @@
 #include "input/common/wayland_common_webos.h"
 #endif

+#include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -351,6 +352,10 @@ extern const bluetooth_driver_t *bluetooth_drivers[];
 /* MAIN GLOBAL VARIABLES */
 struct rarch_state
 {
+   /* retroarch_fail() lands here while retroarch_main_init runs
+    * (RARCH_FLAGS_INIT_IN_PROGRESS) */
+   jmp_buf error_sjlj_context;
+
   char *connect_host; /* Netplay hostname passed from CLI */
   char *connect_mitm_id; /* Netplay MITM address from CLI */

@@ -359,6 +364,7 @@ struct rarch_state
   unsigned perf_ptr_rarch;
   uint32_t flags;

+   char error_string[NAME_MAX_LENGTH];
   char launch_arguments[4096];
   char path_default_shader_preset[PATH_MAX_LENGTH];
   char path_content[PATH_MAX_LENGTH];
@@ -382,7 +388,6 @@ void libnx_apply_overclock(void);
 static struct rarch_state rarch_st        = {0};

 static access_state_t access_state_st     = {0};
-static struct global global_driver_st     = {0}; /* retro_time_t alignment */

 static void retro_frame_null(const void *data, unsigned width,
      unsigned height, size_t pitch) { }
@@ -2242,12 +2247,6 @@ access_state_t *access_state_get_ptr(void)
   return &access_state_st;
 }

-/* GLOBAL POINTER GETTERS */
-global_t *global_get_ptr(void)
-{
-   return &global_driver_st;
-}
-
 uint32_t retroarch_get_flags(void)
 {
   struct rarch_state *p_rarch = &rarch_st;
@@ -4670,7 +4669,7 @@ bool command_event(enum event_command cmd, void *data)
 #endif
         break;
      case CMD_EVENT_RELOAD_CONFIG:
-         config_load(global_get_ptr());
+         config_load();
         break;
      case CMD_EVENT_DSP_FILTER_INIT:
 #ifdef HAVE_DSP_FILTER
@@ -6409,7 +6408,6 @@ static void retroarch_override_setting_free_state(void)

 static void global_free(struct rarch_state *p_rarch)
 {
-   global_t            *global = NULL;
   runloop_state_t *runloop_st = runloop_state_get_ptr();

   content_deinit();
@@ -6443,7 +6441,6 @@ static void global_free(struct rarch_state *p_rarch)
   runloop_st->current_core.flags &= ~(RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS
                                     | RETRO_CORE_FLAG_HAS_SET_SUBSYSTEMS);

-   global                                = global_get_ptr();
   path_clear_all();
   dir_clear_all();

@@ -6460,8 +6457,12 @@ static void global_free(struct rarch_state *p_rarch)
   *runloop_st->name.cheatfile           = '\0';
   *runloop_st->name.label               = '\0';

-   if (global)
-      memset(global, 0, sizeof(struct global));
+   p_rarch->flags                       &= ~(
+                          RARCH_FLAGS_ERR_ON_INIT
+                        | RARCH_FLAGS_LAUNCHED_FROM_CLI
+                        | RARCH_FLAGS_CLI_LOAD_MENU_ON_ERR
+                        | RARCH_FLAGS_INIT_IN_PROGRESS);
+   *p_rarch->error_string                = '\0';
   retroarch_override_setting_free_state();
 }

@@ -6562,7 +6563,7 @@ void main_exit(void *args)

   p_rarch->flags                  &= ~RARCH_FLAGS_HAS_SET_USERNAME;
   runloop_is_inited_clear();
-   global_get_ptr()->flags         &= ~GLOB_FLG_ERR_ON_INIT;
+   rarch_st.flags         &= ~RARCH_FLAGS_ERR_ON_INIT;
 #ifdef HAVE_CONFIGFILE
   p_rarch->flags                  &= ~RARCH_FLAGS_BLOCK_CONFIG_READ;
 #endif
@@ -7742,7 +7743,6 @@ void handle_dbscan_finished(retro_task_t *task,
 **/
 static bool retroarch_parse_input_and_config(
      struct rarch_state *p_rarch,
-      global_t *global,
      int argc, char *argv[])
 {
   unsigned i;
@@ -7892,7 +7892,7 @@ static bool retroarch_parse_input_and_config(
 #ifdef HAVE_CONFIGFILE
   runloop_st->flags              &= ~RUNLOOP_FLAG_OVERRIDES_ACTIVE;
 #endif
-   global->flags                  &= ~GLOB_FLG_CLI_LOAD_MENU_ON_ERR;
+   rarch_st.flags                  &= ~RARCH_FLAGS_CLI_LOAD_MENU_ON_ERR;

   /* Make sure we can call retroarch_parse_input several times ... */
   optind                          = 0;
@@ -8053,7 +8053,7 @@ static bool retroarch_parse_input_and_config(
 #if !defined(HAVE_DYNAMIC)
      config_load_file_salamander();
 #endif
-      config_load(global_get_ptr());
+      config_load();
      /* The network clients took their settings before the file was
       * read (the string fields point at the live buffers, the numeric
       * ones were copied); hand them the loaded values. */
@@ -8423,7 +8423,7 @@ static bool retroarch_parse_input_and_config(
 #endif
               break;
            case RA_OPT_LOAD_MENU_ON_ERROR:
-               global->flags |= GLOB_FLG_CLI_LOAD_MENU_ON_ERR;
+               rarch_st.flags |= RARCH_FLAGS_CLI_LOAD_MENU_ON_ERR;
               break;
            case 'e':
               {
@@ -8547,9 +8547,9 @@ static bool retroarch_parse_input_and_config(
   /* Update global 'content launched from command
    * line' status flag */
   if (cli_active && (cli_core_set || cli_content_set))
-      global->flags |=  (GLOB_FLG_LAUNCHED_FROM_CLI);
+      rarch_st.flags |=  (RARCH_FLAGS_LAUNCHED_FROM_CLI);
   else
-      global->flags &= ~(GLOB_FLG_LAUNCHED_FROM_CLI);
+      rarch_st.flags &= ~(RARCH_FLAGS_LAUNCHED_FROM_CLI);

   /* Copy SRM/state dirs used, so they can be reused on reentrancy. */
   if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) &&
@@ -8615,11 +8615,11 @@ static bool retroarch_core_info_savestate_probe(void)

 /* What a failed phase leaves behind: no core, no session, and the
 * jmp_buf retroarch_fail() would land in dead. */
-static bool retroarch_main_init_fail(global_t *global)
+static bool retroarch_main_init_fail(void)
 {
   command_event(CMD_EVENT_CORE_DEINIT, NULL);
   runloop_is_inited_clear();
-   global->flags &= ~GLOB_FLG_INIT_IN_PROGRESS;
+   rarch_st.flags &= ~RARCH_FLAGS_INIT_IN_PROGRESS;
   return false;
 }

@@ -8717,7 +8717,6 @@ bool retroarch_main_init_core(int argc, char *argv[],
   input_driver_state_t
      *input_st                  = input_state_get_ptr();
   settings_t *settings          = config_get_ptr();
-   global_t            *global   = global_get_ptr();
 #ifdef HAVE_ACCESSIBILITY
   access_state_t *access_st     = access_state_get_ptr();
   bool accessibility_enable     = false;
@@ -8741,27 +8740,27 @@ bool retroarch_main_init_core(int argc, char *argv[],
      AUDIO_FLAGS_SET(audio_state_get_ptr(), AUDIO_FLAG_ACTIVE);
   }

-   if (setjmp(global->error_sjlj_context) > 0)
+   if (setjmp(rarch_st.error_sjlj_context) > 0)
   {
      RARCH_ERR("%s: \"%s\"\n",
            msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN),
-            global_get_ptr()->error_string);
-      return retroarch_main_init_fail(global);
+            rarch_st.error_string);
+      return retroarch_main_init_fail();
   }

   /* Mark error_sjlj_context as live. retroarch_fail checks this
    * before longjmp'ing; reinit-time driver_init failures that
    * reach retroarch_fail outside this function will log and
    * return rather than landing in a stale jmp_buf. */
-   global->flags |= GLOB_FLG_INIT_IN_PROGRESS;
+   rarch_st.flags |= RARCH_FLAGS_INIT_IN_PROGRESS;

-   global->flags |= GLOB_FLG_ERR_ON_INIT;
+   rarch_st.flags |= RARCH_FLAGS_ERR_ON_INIT;

   /* Have to initialise non-file logging once at the start... */
   retro_main_log_file_init(NULL, false);

   verbosity_enabled = retroarch_parse_input_and_config(p_rarch,
-         global_get_ptr(), argc, argv);
+         argc, argv);

 #if defined(HAVE_SSL) && defined(HAVE_NETWORKING)
   /* Apply the persisted TLS certificate-verification policy to the active
@@ -9012,8 +9011,8 @@ bool retroarch_main_init_core(int argc, char *argv[],
   {
 #ifdef HAVE_DYNAMIC
      /* Check if menu was active prior to core initialization */
-      if (   (!(global->flags & GLOB_FLG_LAUNCHED_FROM_CLI))
-          ||   (global->flags & GLOB_FLG_CLI_LOAD_MENU_ON_ERR)
+      if (   (!(rarch_st.flags & RARCH_FLAGS_LAUNCHED_FROM_CLI))
+          ||   (rarch_st.flags & RARCH_FLAGS_CLI_LOAD_MENU_ON_ERR)
 #ifdef HAVE_MENU
          ||  (menu_st->flags & MENU_ST_FLAG_ALIVE)
 #endif
@@ -9052,11 +9051,11 @@ bool retroarch_main_init_core(int argc, char *argv[],
         /* Attempt initializing dummy core */
         runloop_st->current_core_type = CORE_TYPE_DUMMY;
         if (!command_event(CMD_EVENT_CORE_INIT, &runloop_st->current_core_type))
-            return retroarch_main_init_fail(global);
+            return retroarch_main_init_fail();
      }
 #ifdef HAVE_DYNAMIC
      else /* Fall back to regular error handling */
-         return retroarch_main_init_fail(global);
+         return retroarch_main_init_fail();
 #endif
   }

@@ -9073,7 +9072,7 @@ bool retroarch_main_init_core(int argc, char *argv[],
         );
 #endif
   /* The jmp_buf dies with this frame; the next phase arms its own. */
-   global->flags &= ~GLOB_FLG_INIT_IN_PROGRESS;
+   rarch_st.flags &= ~RARCH_FLAGS_INIT_IN_PROGRESS;
   *verbosity     = verbosity_enabled;
   return true;
 }
@@ -9086,16 +9085,15 @@ bool retroarch_main_init_drivers(bool staged,
      *input_st                  = input_state_get_ptr();
   settings_t *settings          = config_get_ptr();
   recording_state_t *rec_st     = recording_state_get_ptr();
-   global_t            *global   = global_get_ptr();

-   if (setjmp(global->error_sjlj_context) > 0)
+   if (setjmp(rarch_st.error_sjlj_context) > 0)
   {
      RARCH_ERR("%s: \"%s\"\n",
            msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN),
-            global_get_ptr()->error_string);
-      return retroarch_main_init_fail(global);
+            rarch_st.error_string);
+      return retroarch_main_init_fail();
   }
-   global->flags |= GLOB_FLG_INIT_IN_PROGRESS;
+   rarch_st.flags |= RARCH_FLAGS_INIT_IN_PROGRESS;

   if (staged)
   {
@@ -9143,7 +9141,7 @@ bool retroarch_main_init_drivers(bool staged,

   command_event(CMD_EVENT_SET_PER_GAME_RESOLUTION, NULL);

-   global->flags                   &= ~GLOB_FLG_ERR_ON_INIT;
+   rarch_st.flags                   &= ~RARCH_FLAGS_ERR_ON_INIT;
   runloop_is_inited_set();

 #ifdef HAVE_DISCORD
@@ -9184,7 +9182,7 @@ bool retroarch_main_init_drivers(bool staged,
   game_ai_init();
 #endif

-   global->flags &= ~GLOB_FLG_INIT_IN_PROGRESS;
+   rarch_st.flags &= ~RARCH_FLAGS_INIT_IN_PROGRESS;
   return true;
 }

@@ -9450,6 +9448,9 @@ bool retroarch_ctl(enum rarch_ctl_state state, void *data)
         break;
 #endif /* HAVE_XDELTA */
 #endif /* HAVE_PATCH */
+      case RARCH_CTL_UNSET_LAUNCHED_FROM_CLI:
+         p_rarch->flags &= ~RARCH_FLAGS_LAUNCHED_FROM_CLI;
+         break;
      case RARCH_CTL_IS_DUMMY_CORE:
         return runloop_st->current_core_type == CORE_TYPE_DUMMY;
      case RARCH_CTL_IS_CORE_LOADED:
@@ -9814,9 +9815,8 @@ size_t retroarch_get_capabilities(enum rarch_capabilities type,

 void retroarch_fail(int err_code, const char *err)
 {
-   global_t *global                = global_get_ptr();
-   strlcpy(global->error_string, err,
-         sizeof(global->error_string));
+   strlcpy(rarch_st.error_string, err,
+         sizeof(rarch_st.error_string));

   /* Only longjmp if retroarch_main_init's setjmp is still live.
    * Outside that scope (e.g. when drivers_init runs from
@@ -9833,8 +9833,8 @@ void retroarch_fail(int err_code, const char *err)
    * than crashing. The caller (drivers_init) will see the
    * subsystem fail to init and that subsystem's downstream code
    * is expected to NULL-check its driver pointers. */
-   if (global->flags & GLOB_FLG_INIT_IN_PROGRESS)
-      longjmp(global->error_sjlj_context, err_code);
+   if (rarch_st.flags & RARCH_FLAGS_INIT_IN_PROGRESS)
+      longjmp(rarch_st.error_sjlj_context, err_code);

   RARCH_ERR("[Core] retroarch_fail outside retroarch_main_init: %s\n",
         err);
@@ -9845,10 +9845,9 @@ bool should_quit_on_close(void)
 {
 #ifdef HAVE_MENU
   settings_t *settings   = config_get_ptr();
-   global_t   *global     = global_get_ptr();
   if (       ((settings->uints.quit_on_close_content ==
               QUIT_ON_CLOSE_CONTENT_CLI)
-            && (global->flags & GLOB_FLG_LAUNCHED_FROM_CLI))
+            && (rarch_st.flags & RARCH_FLAGS_LAUNCHED_FROM_CLI))
            || (settings->uints.quit_on_close_content ==
               QUIT_ON_CLOSE_CONTENT_ENABLED)
      )
@@ -114,7 +114,20 @@ enum rarch_state_flags
   RARCH_FLAGS_HAS_SET_OVERLAY_PRESET       = (1 << 17),
   /* An unload asked for a cloud sync, which waits for the content's
    * deinit to finish. */
-   RARCH_FLAGS_CLOUD_SYNC_ON_DEINIT         = (1 << 18)
+   RARCH_FLAGS_CLOUD_SYNC_ON_DEINIT         = (1 << 18),
+   /* Initialisation failed; the menu goes to the dummy core rather
+    * than back to content on exit. */
+   RARCH_FLAGS_ERR_ON_INIT                  = (1 << 19),
+   RARCH_FLAGS_LAUNCHED_FROM_CLI            = (1 << 20),
+   RARCH_FLAGS_CLI_LOAD_MENU_ON_ERR         = (1 << 21),
+   /* Set on entry to retroarch_main_init (right after its setjmp
+    * is established) and cleared on every exit. retroarch_fail
+    * checks this flag before longjmp'ing - the jmp_buf is only
+    * valid while retroarch_main_init is on the stack; calling
+    * retroarch_fail from any other context (e.g. a reinit-time
+    * drivers_init invoked via command_event_reinit) with the flag
+    * clear means the longjmp would land in stale stack memory. */
+   RARCH_FLAGS_INIT_IN_PROGRESS             = (1 << 22)
 };

 bool retroarch_ctl(enum rarch_ctl_state state, void *data);
@@ -171,8 +184,6 @@ bool retroarch_main_init_drivers(bool staged,

 bool retroarch_main_quit(void);

-global_t *global_get_ptr(void);
-
 content_state_t *content_state_get_ptr(void);

 unsigned content_get_subsystem_rom_id(void);
@@ -1,7 +1,6 @@
 #ifndef _RETROARCH_TYPES_H
 #define _RETROARCH_TYPES_H

-#include <setjmp.h>
 #include <boolean.h>
 #include <retro_inline.h>
 #include <retro_common_api.h>
@@ -66,6 +65,8 @@ enum rarch_ctl_state
   RARCH_CTL_UNSET_IPS_PREF,
   RARCH_CTL_UNSET_XDELTA_PREF,

+   RARCH_CTL_UNSET_LAUNCHED_FROM_CLI,
+
 #ifdef HAVE_CONFIGFILE
   /* Block config read */
   RARCH_CTL_SET_BLOCK_CONFIG_READ,
@@ -250,42 +251,6 @@ struct rarch_main_wrap
   uint8_t flags;
 };

-/* All run-time- / command line flag-related globals go here. */
-enum global_flags
-{
-   GLOB_FLG_ERR_ON_INIT          = (1 << 0),
-   GLOB_FLG_LAUNCHED_FROM_CLI    = (1 << 1),
-   GLOB_FLG_CLI_LOAD_MENU_ON_ERR = (1 << 2),
-   /* Set on entry to retroarch_main_init (right after its setjmp
-    * is established) and cleared on every exit. retroarch_fail
-    * checks this flag before longjmp'ing - the error_sjlj_context
-    * jmp_buf is only valid while retroarch_main_init is on the
-    * stack; calling retroarch_fail from any other context (e.g.
-    * a reinit-time drivers_init invoked via command_event_reinit)
-    * with the flag clear means the longjmp would land in stale
-    * stack memory. */
-   GLOB_FLG_INIT_IN_PROGRESS     = (1 << 3)
-};
-
-typedef struct global
-{
-   jmp_buf error_sjlj_context; /* 4-byte alignment, put it right before long */
-
-   /* Settings and/or global state that is specific to
-    * a console-style implementation. */
-   struct
-   {
-      struct
-      {
-         bool pal_enable;
-         bool pal60_enable;
-      } screen;
-   } console;
-
-   char error_string[NAME_MAX_LENGTH];
-   uint8_t flags;
-} global_t;
-
 typedef struct content_file_override
 {
   char *ext;
@@ -8683,7 +8683,7 @@ int runloop_iterate(void)
   switch ((enum runloop_state_enum)runloop_check_state(
            input_st, audio_st, video_st,
            uico_st,
-            ((global_get_ptr()->flags & GLOB_FLG_ERR_ON_INIT) > 0),
+            ((retroarch_get_flags() & RARCH_FLAGS_ERR_ON_INIT) > 0),
            settings, current_time, netplay_allow_pause,
            netplay_allow_timeskip))
   {
@@ -95,11 +95,9 @@ int32_t videoGetResolutionAvailability(uint32_t videoOut, uint32_t resolutionId,

 /* ---- stubbed RetroArch ---- */

-static global_t   g_global;
 static settings_t g_settings;
 static unsigned   reinits;

-global_t   *global_get_ptr(void) { return &g_global; }
 settings_t *config_get_ptr(void) { return &g_settings; }

 static void store(unsigned dims)
@@ -1,13 +1,14 @@
-/* Single-source definitions: console screen filters and gamma.
+/* Single-source definitions: console screen filters, gamma and PS3
+ * PAL60.
 * Grammar identical to settings_def_video_sync.h plus S_FLOAT and
 * the _NS no-sublabel variants; the descriptor argument span
 * matches SDESC_<kind>_ROW; row order is menu display order;
 * h2json.py parses these rows for the Crowdin source upload. */

 /* Descriptor rows follow the consoles that have each setting; the
- * string tables always carry them via the strings pass.  The config
+ * string tables always carry them via the strings pass.  Most config
 * keys differ from the label strings, so the configuration.c rows
- * stay literal. */
+ * stay literal for all of them. */
 #ifndef SETTINGS_DEF_CONFIG_PASS
 #if defined(GEKKO) || defined(_XBOX360) || defined(SETTINGS_DEF_STRINGS_PASS)
 S_UINT_NS(video_gamma, VIDEO_GAMMA,
@@ -21,6 +22,12 @@ S_BOOL_NS(video_soft_filter, VIDEO_SOFT_FILTER,
      DEFAULT_SOFT_FILTER, SD_FLAG_NONE, 0, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES,
      "Soft Filter")
 #endif
+#if defined(HAVE_PSGL) || defined(SETTINGS_DEF_STRINGS_PASS)
+S_BOOL_NS(video_pal60_enable, PAL60_ENABLE,
+      "pal60_enable",
+      DEFAULT_PAL60_ENABLE, SD_FLAG_NONE, 0, CMD_EVENT_NONE,
+      "Use PAL60 Mode")
+#endif
 #if defined(_XBOX1) || defined(SETTINGS_DEF_STRINGS_PASS)
 S_UINT_NS(video_flicker_filter, VIDEO_FILTER_FLICKER,
      "video_filter_flicker",
@@ -3547,7 +3547,6 @@ bool task_push_load_content_with_new_core_from_companion_ui(
      retro_task_callback_t cb,
      void *user_data)
 {
-   global_t *global            = global_get_ptr();
   runloop_state_t *runloop_st = runloop_state_get_ptr();
   content_state_t  *p_content = content_state_get_ptr();

@@ -3569,7 +3568,7 @@ bool task_push_load_content_with_new_core_from_companion_ui(
   command_event(CMD_EVENT_LOAD_CORE, NULL);
 #endif

-   global->flags &= ~GLOB_FLG_LAUNCHED_FROM_CLI;
+   retroarch_ctl(RARCH_CTL_UNSET_LAUNCHED_FROM_CLI, NULL);

   if (label)
      strlcpy(runloop_st->name.label, label, sizeof(runloop_st->name.label));