GPU (macOS): removes useless @available tests

2026-09-13 02:42:09 +02:00 · 2026-08-18 15:56:33 +08:00
parent e5b6e3612a
commit 7c93f9c82a
1 changed files with 58 additions and 64 deletions
@@ -14,74 +14,68 @@
    #define MTLFeatureSet_macOS_GPUFamily2_v1 ((MTLFeatureSet) 10005)
 #endif

-const char* ffGpuDetectDriverVersion(FFlist* gpus)
-{
-    if (@available(macOS 10.7, *))
-    {
-        NSMutableArray* arr = NSMutableArray.new;
-        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-            [arr addObject:@(x->driver.chars)];
-
-        NSDictionary* dict = CFBridgingRelease(KextManagerCopyLoadedKextInfo((__bridge CFArrayRef)arr, (__bridge CFArrayRef)@[@"CFBundleVersion"]));
-        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-        {
-            NSString* version = dict[@(x->driver.chars)][@"CFBundleVersion"];
-            if (version)
-            {
-                ffStrbufAppendC(&x->driver, ' ');
-                ffStrbufAppendS(&x->driver, version.UTF8String);
-            }
-        }
-        return nullptr;
+const char* ffGpuDetectDriverVersion(FFlist* gpus) {
+    NSMutableArray* arr = NSMutableArray.new;
+    FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+        [arr addObject:@(x->driver.chars)];
    }
-    return "Unsupported macOS version";
+
+    NSDictionary* dict = CFBridgingRelease(KextManagerCopyLoadedKextInfo((__bridge CFArrayRef) arr, (__bridge CFArrayRef) @[ @"CFBundleVersion" ]));
+    FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+        NSString* version = dict[@(x->driver.chars)][@"CFBundleVersion"];
+        if (version) {
+            ffStrbufAppendC(&x->driver, ' ');
+            ffStrbufAppendS(&x->driver, version.UTF8String);
+        }
+    }
+    return nullptr;
 }

-const char* ffGpuDetectMetal(FFlist* gpus)
-{
-    if (@available(macOS 10.13, *))
-    {
-        for (id<MTLDevice> device in MTLCopyAllDevices())
-        {
-            FFGPUResult* gpu = nullptr;
-            FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-            {
-                if (x->deviceId == device.registryID)
-                {
-                    gpu = x;
-                    break;
-                }
+const char* ffGpuDetectMetal(FFlist* gpus) {
+    // Metal.framework is statically linked into the application,
+    // so `MTLCopyAllDevices` is always available, or the application will not start.
+    for (id<MTLDevice> device in MTLCopyAllDevices()) {
+        FFGPUResult* gpu = nullptr;
+        FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+            if (x->deviceId == device.registryID) {
+                gpu = x;
+                break;
            }
-            if (!gpu) continue;
-
-            #ifndef MAC_OS_X_VERSION_10_15
-            if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily2_v1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 2");
-            else if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily1_v1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 1");
-            #else // MAC_OS_X_VERSION_10_15
-            #pragma clang diagnostic push
-            #pragma clang diagnostic ignored "-Wunguarded-availability-new"
-            if ([device supportsFamily:MTLGPUFamilyMetal4])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal 4");
-            else if ([device supportsFamily:MTLGPUFamilyMetal3])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal 3");
-            #pragma clang diagnostic pop
-            else if ([device supportsFamily:MTLGPUFamilyCommon3])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 3");
-            else if ([device supportsFamily:MTLGPUFamilyCommon2])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 2");
-            else if ([device supportsFamily:MTLGPUFamilyCommon1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 1");
-
-            gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
-            gpu->index = (uint32_t) device.locationNumber;
-
-            if (device.hasUnifiedMemory && device.recommendedMaxWorkingSetSize > 0)
-                gpu->shared.total = device.recommendedMaxWorkingSetSize;
-            #endif
        }
-        return nullptr;
+        if (!gpu) {
+            continue;
+        }
+
+#ifndef MAC_OS_X_VERSION_10_15
+        if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily2_v1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 2");
+        } else if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily1_v1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 1");
+        }
+#else // MAC_OS_X_VERSION_10_15
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wunguarded-availability-new"
+        if ([device supportsFamily:MTLGPUFamilyMetal4]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal 4");
+        } else if ([device supportsFamily:MTLGPUFamilyMetal3]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal 3");
+        }
+    #pragma clang diagnostic pop
+        else if ([device supportsFamily:MTLGPUFamilyCommon3]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 3");
+        } else if ([device supportsFamily:MTLGPUFamilyCommon2]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 2");
+        } else if ([device supportsFamily:MTLGPUFamilyCommon1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 1");
+        }
+
+        gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+        gpu->index = (uint32_t) device.locationNumber;
+
+        if (device.hasUnifiedMemory && device.recommendedMaxWorkingSetSize > 0) {
+            gpu->shared.total = device.recommendedMaxWorkingSetSize;
+        }
+#endif
    }
-    return "Metal API is not supported by this macOS version";
+    return nullptr;
 }