apple: better metal arg buffer check

Author: warmenhoven

config.def.h

@@ -498,12 +498,6 @@
 /* Choose if the screen will be able to write around the notch or not */
 #define DEFAULT_NOTCH_WRITE_OVER_ENABLE false
 
-#if defined(__APPLE__) && defined(HAVE_VULKAN)
-#define DEFAULT_USE_METAL_ARG_BUFFERS (!!__builtin_available(macOS 12, iOS 13, tvOS 12, *))
-#else
-#define DEFAULT_USE_METAL_ARG_BUFFERS false
-#endif
-
 /* Enable use of shaders */
 #define DEFAULT_SHADER_ENABLE true
 

configuration.c

@@ -1767,6 +1767,15 @@ static struct config_path_setting *populate_settings_path(
    return tmp;
 }
 
+#if defined(__APPLE__) && defined(HAVE_VULKAN)
+bool config_metal_arg_buffers_default(void)
+{
+   if (__builtin_available(macOS 12.0, iOS 13.0, tvOS 12.0, *))
+      return true;
+   return false;
+}
+#endif
+
 /* ---------------------------------------------------------------------------
  * SETTINGS_*_COUNT_MAX constants are defined above the populate functions.
  * Compile-time check (via negative array) can be added here if needed.
@@ -1968,7 +1977,7 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("video_post_filter_record",      &settings->bools.video_post_filter_record, true, DEFAULT_POST_FILTER_RECORD, false);
    SETTING_BOOL("video_notch_write_over_enable", &settings->bools.video_notch_write_over_enable, true, DEFAULT_NOTCH_WRITE_OVER_ENABLE, false);
 #if defined(__APPLE__) && defined(HAVE_VULKAN)
-   SETTING_BOOL("video_use_metal_arg_buffers",   &settings->bools.video_use_metal_arg_buffers, true, DEFAULT_USE_METAL_ARG_BUFFERS, false);
+   SETTING_BOOL("video_use_metal_arg_buffers",   &settings->bools.video_use_metal_arg_buffers, true, config_metal_arg_buffers_default(), false);
 #endif
    SETTING_BOOL("video_msg_bgcolor_enable",      &settings->bools.video_msg_bgcolor_enable, true, DEFAULT_MESSAGE_BGCOLOR_ENABLE, false);
    SETTING_BOOL("video_window_show_decorations", &settings->bools.video_window_show_decorations, true, DEFAULT_WINDOW_DECORATIONS, false);

configuration.h

@@ -1396,6 +1396,10 @@ bool config_replace(bool config_save_on_exit, char *path);
 
 bool config_overlay_enable_default(void);
 
+#if defined(__APPLE__) && defined(HAVE_VULKAN)
+bool config_metal_arg_buffers_default(void);
+#endif
+
 void config_set_defaults(void *data);
 
 void config_load(void *data);

menu/menu_setting.c

@@ -13151,7 +13151,7 @@ static bool setting_append_list(
                      &settings->bools.video_use_metal_arg_buffers,
                      MENU_ENUM_LABEL_VIDEO_USE_METAL_ARG_BUFFERS,
                      MENU_ENUM_LABEL_VALUE_VIDEO_USE_METAL_ARG_BUFFERS,
-                     DEFAULT_USE_METAL_ARG_BUFFERS,
+                     config_metal_arg_buffers_default(),
                      MENU_ENUM_LABEL_VALUE_OFF,
                      MENU_ENUM_LABEL_VALUE_ON,
                      &group_info,