Merge pull request #159 from pmndrs/feat/apple-silicon-desktop-tier

puckey · web-flow · commit 03b681a7eec5 · 2026-04-14T16:27:51.000+02:00
feat: conservative tier-3 fallback for Apple Silicon desktop Safari
diff --git a/index.html b/index.html
@@ -2,6 +2,11 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <script>
+      // During `pnpm dev` the static server runs on :8000; redirect to the
+      // local-dist page so refreshes pick up uncommitted source changes.
+      if (location.port === '8000') location.replace('./local.html');
+    </script>
     <title>detect-gpu</title>
     <style>
       body {
diff --git a/local.html b/local.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>detect-gpu (local)</title>
+    <style>
+      body {
+        font-family: system-ui, sans-serif;
+        font-size: 1.25em;
+        padding: 2rem;
+      }
+    </style>
+  </head>
+  <body>
+    <pre id="root">Detecting GPU…</pre>
+    <script type="module">
+      import { getGPUTier } from './dist/index.mjs';
+      const result = await getGPUTier({ benchmarksURL: './dist/benchmarks' });
+      document.getElementById('root').textContent = JSON.stringify(
+        result,
+        null,
+        2
+      );
+    </script>
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -58,6 +58,9 @@
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
     "build": "tsdown",
+    "dev": "pnpm run --parallel /^dev:/",
+    "dev:build": "tsdown --watch",
+    "dev:serve": "echo 'open http://localhost:8000/local.html' && python3 -m http.server 8000",
     "update-benchmarks": "node ./scripts/update_benchmarks.ts"
   },
   "devDependencies": {
diff --git a/src/index.ts b/src/index.ts
@@ -316,9 +316,22 @@ export const getGPUTier = async ({
     const blocklistedModel: string | undefined = BLOCKLISTED_GPUS.find(
       (blocklistedModel) => renderer!.includes(blocklistedModel)
     );
-    return blocklistedModel
-      ? toResult(0, 'BLOCKLISTED', blocklistedModel)
-      : toResult(1, 'FALLBACK', `${renderer} (${rawRenderer})`);
+    if (blocklistedModel) return toResult(0, 'BLOCKLISTED', blocklistedModel);
+
+    // Apple Silicon on desktop Safari: the renderer string is the generic
+    // "Apple GPU" and Safari reports identical WebGL capabilities across
+    // M1–M5 (verified empirically on M1 Max / M2 / M4), so no web-facing
+    // signal can identify the specific chip. The floor of the M-series
+    // (base M1) sustains 60fps in our benchmark scene, which maps to the
+    // top bin under the default `desktopTiers: [0, 15, 30, 60]` — so
+    // tier 3 is a true lower bound for every Apple Silicon Mac, not a
+    // guess. iPhone/iPad take an earlier path (deobfuscateAppleGPU fans
+    // out to chip candidates), so this only fires on desktop.
+    if (!isMobile && renderer === 'apple gpu') {
+      return toResult(3, 'FALLBACK', 'apple gpu', 60);
+    }
+
+    return toResult(1, 'FALLBACK', `${renderer} (${rawRenderer})`);
   }
 
   const [, fps, model, device] = results[0];
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -324,6 +324,33 @@ for (const { input, expected } of [
   });
 });
 
+test('Apple Silicon desktop Safari — conservative tier-3 FALLBACK', async () => {
+  // Safari returns 'Apple GPU' uniformly for M1–M5 with no chip-level
+  // discrimination available from WebGL. Since base M1 already hits the
+  // tier-3 fps floor in our benchmarks, the conservative guess is tier 3.
+  const result = await getTier({
+    isMobile: false,
+    renderer: 'Apple GPU',
+  });
+  expectGPUResults(
+    { type: 'FALLBACK', tier: 3, gpu: 'apple gpu', isMobile: false },
+    result
+  );
+  expect(result.fps).toBe(60);
+});
+
+test('Apple GPU on mobile does NOT take the desktop tier-3 path', async () => {
+  // iPhone/iPad route through deobfuscateAppleGPU and resolve to specific
+  // chip benchmarks. The desktop tier-3 fallback must not fire on mobile,
+  // even with the same masked renderer string.
+  const result = await getTier({
+    isMobile: true,
+    renderer: 'Apple GPU',
+  });
+  expect(result.tier).not.toBe(3);
+  expect(result.gpu).not.toBe('apple gpu');
+});
+
 // expect BLOCKLISTED results:
 [
   {
