Consolidate Apple display-info helpers (refresh rate + output size)

Six copies across cocoa_gl_ctx.m, cocoa_vk_ctx.m, and metal.m
collapse to two shared helpers in cocoa_common.m.  Each driver
keeps a named vtable entry (forwarding thunk) because the three
entry points are reached through different paths that bypass each
other — dispserv-first, ctx-direct from vulkan.c, and
poke-direct from video_thread_wrapper.c.  dispserv_apple fills its
two previously-NULL slots against the same helpers.
Incidentally fixes unguarded @available sites on pre-iOS-10 (masked
by Metal/MoltenVK deployment minimums) and the unconditional
nativeBounds call (iOS 8+) that would throw on iOS 6/7.  macOS 10.5
now returns a real refresh rate instead of a hardcoded 60.

Author: LibretroAdmin

gfx/display_servers/dispserv_apple.m

@@ -42,17 +42,13 @@
 #else
 #import <ApplicationServices/ApplicationServices.h>
 #endif
-/* The CGDisplayModeRef family (CGDisplayCopyAllDisplayModes,
+/* RARCH_HAS_CGDISPLAYMODE_API is defined in cocoa_common.h.  The
+ * CGDisplayModeRef family (CGDisplayCopyAllDisplayModes,
  * CGDisplayModeGetWidth, CGDisplaySetDisplayMode, ...) arrived in
  * 10.6 Snow Leopard.  The 10.5 SDK only offers the older
  * CGDisplayAvailableModes / CFDictionaryRef path, which is a
  * different enough API that we just stub the resolution list on
  * pre-10.6 targets rather than port to both. */
-#if defined(MAC_OS_X_VERSION_10_6) && \
-    (!defined(MAC_OS_X_VERSION_MIN_REQUIRED) || \
-     MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-#define RARCH_HAS_CGDISPLAYMODE_API 1
-#endif
 #endif
 
 #ifdef OSX
@@ -578,6 +574,21 @@ static void apple_display_server_destroy(void *data)
    free(apple);
 }
 
+/* Thin wrappers around cocoa_common.m helpers to match the
+ * video_display_server_t signatures (which take a leading void*).
+ * Shared implementation lives in cocoa_common.m so the poke /
+ * gfx_ctx_driver_t vtables can reach it too - see cocoa_common.h. */
+static float apple_display_server_get_refresh_rate(void *data)
+{
+   return cocoa_get_refresh_rate();
+}
+
+static void apple_display_server_get_video_output_size(void *data,
+      unsigned *width, unsigned *height, char *desc, size_t desc_len)
+{
+   cocoa_get_video_output_size(width, height, desc, desc_len);
+}
+
 const video_display_server_t dispserv_apple = {
    apple_display_server_init,
    apple_display_server_destroy,
@@ -608,8 +619,8 @@ static void apple_display_server_destroy(void *data)
    NULL, /* set_screen_orientation */
    NULL, /* get_screen_orientation */
 #endif
-   NULL, /* get_refresh_rate */
-   NULL, /* get_video_output_size */
+   apple_display_server_get_refresh_rate,
+   apple_display_server_get_video_output_size,
    NULL, /* get_video_output_prev */
    NULL, /* get_video_output_next */
    cocoa_get_metrics,

gfx/drivers/metal.m

@@ -5306,26 +5306,10 @@ static void metal_set_video_mode(void *data,
 
 static float metal_get_refresh_rate(void *data)
 {
-#ifdef OSX
-   CGDirectDisplayID mainDisplayID = CGMainDisplayID();
-   CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(mainDisplayID);
-   double currentRate = CGDisplayModeGetRefreshRate(currentMode);
-   CFRelease(currentMode);
-   return currentRate;
-#else
-   CADisplayLink *displayLink = [CocoaView get].displayLink;
-   if (displayLink)
-   {
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 || __TV_OS_VERSION_MAX_ALLOWED >= 150000
-      if (@available(iOS 15.0, tvOS 15.0, *))
-         return displayLink.preferredFrameRateRange.preferred;
-#endif
-      return displayLink.preferredFramesPerSecond;
-   }
-   if (@available(iOS 10.3, tvOS 10.2, *))
-      return [UIScreen mainScreen].maximumFramesPerSecond;
-   return 60.0f;
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * poke entry because video_driver_get_refresh_rate falls back
+    * to poke->get_refresh_rate when dispserv returns 0. */
+   return cocoa_get_refresh_rate();
 }
 
 static void metal_set_filtering(void *data, unsigned index, bool smooth, bool ctx_scaling)
@@ -5412,38 +5396,11 @@ static uint32_t metal_get_flags(void *data)
 static void metal_get_video_output_size(void *data,
       unsigned *width, unsigned *height, char *desc, size_t desc_len)
 {
-#if TARGET_OS_IPHONE
-   /* iOS/tvOS: Return physical screen resolution, not window size */
-   UIScreen *screen = [UIScreen mainScreen];
-   CGRect nativeBounds = screen.nativeBounds;
-   *width  = (unsigned)nativeBounds.size.width;
-   *height = (unsigned)nativeBounds.size.height;
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_native_scale();
-      if (scale >= 3.0f)
-         strlcpy(desc, "Super Retina", desc_len);
-      else if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#else
-   /* macOS: Return display resolution */
-   CGDirectDisplayID display = CGMainDisplayID();
-   *width  = (unsigned)CGDisplayPixelsWide(display);
-   *height = (unsigned)CGDisplayPixelsHigh(display);
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_backing_scale_factor();
-      if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * poke entry because video_thread_wrapper.c's
+    * thread_get_video_output_size calls poke->get_video_output_size
+    * directly, bypassing dispserv_apple. */
+   cocoa_get_video_output_size(width, height, desc, desc_len);
 }
 
 /* HDR poke interface setters.

gfx/drivers_context/cocoa_gl_ctx.m

@@ -259,26 +259,11 @@ static void cocoa_gl_gfx_ctx_get_video_size(void *data,
 
 static float cocoa_gl_gfx_ctx_get_refresh_rate(void *data)
 {
-#ifdef OSX
-#ifdef MAC_OS_X_VERSION_10_6
-    /* CGDisplayModeRef and CGDisplayCopyDisplayMode are 10.6+.
-     * On the 10.5 Leopard SDK only the older CFDictionaryRef-based
-     * CGDisplayCurrentMode API exists; not worth wiring up for a
-     * refresh-rate readout, so fall back to 60. */
-    CGDirectDisplayID mainDisplayID = CGMainDisplayID();
-    CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(mainDisplayID);
-    float currentRate = CGDisplayModeGetRefreshRate(currentMode);
-    CFRelease(currentMode);
-    return currentRate;
-#else
-    return 60.0f;
-#endif
-#else
-    if (@available(iOS 10.3, tvOS 10.2, *))
-       return [UIScreen mainScreen].maximumFramesPerSecond;
-    else
-       return 60;
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * vtable entry because vulkan.c-style code paths reach the
+    * ctx driver directly via video_context_driver_get_refresh_rate,
+    * bypassing dispserv_apple's own hook. */
+   return cocoa_get_refresh_rate();
 }
 
 static gfx_ctx_proc_t cocoa_gl_gfx_ctx_get_proc_address(const char *symbol_name)
@@ -719,38 +704,11 @@ static bool cocoa_gl_gfx_ctx_set_resize(void *data, unsigned width, unsigned hei
 static void cocoa_gl_gfx_ctx_get_video_output_size(void *data,
       unsigned *width, unsigned *height, char *desc, size_t desc_len)
 {
-#if TARGET_OS_IPHONE
-   /* iOS/tvOS: Return physical screen resolution, not window size */
-   UIScreen *screen = [UIScreen mainScreen];
-   CGRect nativeBounds = screen.nativeBounds;
-   *width  = (unsigned)nativeBounds.size.width;
-   *height = (unsigned)nativeBounds.size.height;
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_native_scale();
-      if (scale >= 3.0f)
-         strlcpy(desc, "Super Retina", desc_len);
-      else if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#else
-   /* macOS: Return display resolution */
-   CGDirectDisplayID display = CGMainDisplayID();
-   *width  = (unsigned)CGDisplayPixelsWide(display);
-   *height = (unsigned)CGDisplayPixelsHigh(display);
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_backing_scale_factor();
-      if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * vtable entry because video_thread_wrapper.c's
+    * thread_get_video_output_size calls the poke / ctx hook
+    * directly, bypassing dispserv_apple. */
+   cocoa_get_video_output_size(width, height, desc, desc_len);
 }
 
 const gfx_ctx_driver_t gfx_ctx_cocoagl = {

gfx/drivers_context/cocoa_vk_ctx.m

@@ -140,15 +140,11 @@ static void cocoa_vk_gfx_ctx_get_video_size(void *data,
 
 static float cocoa_vk_gfx_ctx_get_refresh_rate(void *data)
 {
-#ifdef OSX
-    CGDirectDisplayID mainDisplayID = CGMainDisplayID();
-    CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(mainDisplayID);
-    float currentRate = CGDisplayModeGetRefreshRate(currentMode);
-    CFRelease(currentMode);
-    return currentRate;
-#else
-    return [UIScreen mainScreen].maximumFramesPerSecond;
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * vtable entry because vulkan_get_refresh_rate() reaches the
+    * ctx driver directly via video_context_driver_get_refresh_rate,
+    * bypassing dispserv_apple's own hook. */
+   return cocoa_get_refresh_rate();
 }
 
 static gfx_ctx_proc_t cocoa_vk_gfx_ctx_get_proc_address(const char *symbol_name)
@@ -353,38 +349,11 @@ static bool cocoa_vk_gfx_ctx_set_resize(void *data, unsigned width, unsigned hei
 static void cocoa_vk_gfx_ctx_get_video_output_size(void *data,
       unsigned *width, unsigned *height, char *desc, size_t desc_len)
 {
-#if TARGET_OS_IPHONE
-   /* iOS/tvOS: Return physical screen resolution, not window size */
-   UIScreen *screen = [UIScreen mainScreen];
-   CGRect nativeBounds = screen.nativeBounds;
-   *width  = (unsigned)nativeBounds.size.width;
-   *height = (unsigned)nativeBounds.size.height;
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_native_scale();
-      if (scale >= 3.0f)
-         strlcpy(desc, "Super Retina", desc_len);
-      else if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#else
-   /* macOS: Return display resolution */
-   CGDirectDisplayID display = CGMainDisplayID();
-   *width  = (unsigned)CGDisplayPixelsWide(display);
-   *height = (unsigned)CGDisplayPixelsHigh(display);
-
-   if (desc && desc_len > 0)
-   {
-      float scale = cocoa_screen_get_backing_scale_factor();
-      if (scale >= 2.0f)
-         strlcpy(desc, "Retina", desc_len);
-      else
-         strlcpy(desc, "Standard", desc_len);
-   }
-#endif
+   /* Body consolidated into cocoa_common.m.  Kept as a named
+    * vtable entry because video_thread_wrapper.c's
+    * thread_get_video_output_size calls the poke / ctx hook
+    * directly, bypassing dispserv_apple. */
+   cocoa_get_video_output_size(width, height, desc, desc_len);
 }
 
 const gfx_ctx_driver_t gfx_ctx_cocoavk = {

ui/drivers/cocoa/cocoa_common.h

@@ -29,6 +29,20 @@
 #include <AppKit/AppKit.h>
 #endif
 
+/* The CGDisplayModeRef family (CGDisplayCopyDisplayMode,
+ * CGDisplayCopyAllDisplayModes, CGDisplayModeGetRefreshRate, ...)
+ * arrived in 10.6 Snow Leopard.  The 10.5 Leopard SDK only offers
+ * the older CGDisplayCurrentMode + CFDictionaryRef path.  Sites that
+ * use either API (cocoa_common.m's cocoa_get_refresh_rate and
+ * dispserv_apple.m's resolution-switching code) branch on this
+ * macro.  Defined here so every translation unit sees the same
+ * answer. */
+#if defined(OSX) && defined(MAC_OS_X_VERSION_10_6) && \
+    (!defined(MAC_OS_X_VERSION_MIN_REQUIRED) || \
+     MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
+#define RARCH_HAS_CGDISPLAYMODE_API 1
+#endif
+
 /* RetroArchPlaylistManager.m/.h uses Obj-C nullability macros
  * (NS_ASSUME_NONNULL_BEGIN/END, nullable, _Nonnull) and
  * lightweight generics (NSArray<...>) - all Xcode 7+ (2015)
@@ -157,6 +171,25 @@ bool cocoa_get_metrics(
       void *data, enum display_metric_types type,
       float *value);
 
+/* Shared display-info helpers.
+ *
+ * Three vtables call these via thin wrappers, because different
+ * call sites reach them through different paths:
+ *   - video_driver_get_refresh_rate / _get_video_output_size go
+ *     through dispserv first, poke second.
+ *   - video_context_driver_get_refresh_rate (used by vulkan.c's
+ *     vulkan_get_refresh_rate) goes straight to the gfx_ctx_driver_t
+ *     vtable, bypassing dispserv.
+ *   - video_thread_wrapper.c's thread_get_video_output_size calls
+ *     poke->get_video_output_size directly, bypassing dispserv.
+ *
+ * Each vtable therefore keeps a registered function; the bodies all
+ * funnel here so there is only one implementation per platform. */
+float cocoa_get_refresh_rate(void);
+
+void  cocoa_get_video_output_size(unsigned *width, unsigned *height,
+      char *desc, size_t desc_len);
+
 #endif
 
 void cocoa_file_load_with_detect_core(const char *filename);