Merge pull request #4 from habx/feature/1.1/fix-apple-gpu

APP-21472: Fixed Apple GPU sometimes returning Infinity performance
habx · Jun 2, 2021 · 039b716 · 039b716
2 parents 4abf2f7 + 640ae86
commit 039b716
Show file tree

Hide file tree

Showing 14 changed files with 15,795 additions and 9,573 deletions.
diff --git a/data/database.json b/data/database.json
diff --git a/data/notebookcheck-gpus.json b/data/notebookcheck-gpus.json
diff --git a/data/videocard-benchmark-gpus.json b/data/videocard-benchmark-gpus.json
diff --git a/dist/database.js b/dist/database.js
diff --git a/dist/database.js.map b/dist/database.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "1.1.2",
   "scripts": {
     "build": "rollup -c",
+    "build:watch": "rollup -c -w",
     "regenerate-database": "node scripts/generate-normalized-database.js",
     "download-data": "node scripts/download-gpu-data.js && npm run regenerate-database",
     "log-matches": "node scripts/print-db-matches.js > data/db-matches.txt && node scripts/print-sample-matches.js > data/sample-matches.txt"

diff --git a/scripts/generate-normalized-database.js b/scripts/generate-normalized-database.js
@@ -1,7 +1,7 @@
 const VB = require('./fetch-videocard-benchmark.js');
 const TP = require('./fetch-techpowerup-specs.js');
 const NC = require('./fetch-notebookcheck-specs.js');
-const { findMatch_old } = require('../umd/utils.js');
+const { findMatch_old } = require('../dist/utils.js');
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash')

diff --git a/src/apple-device-detection.js b/src/apple-device-detection.js
@@ -32,6 +32,18 @@ function detectAppleDevice(gpu) {
 
   const pixelRatio = window.devicePixelRatio
 
+  let type
+
+  const userAgent = window.navigator.userAgent.toLowerCase()
+  // WIP
+  // const iosVersion = userAgent.match(/CPU OS ([0-9]*)/)[1]
+
+  if (userAgent.includes('ipad')) {
+    type = 'iPad' 
+  } else if (userAgent.includes('iphone') || userAgent.includes('ipod')) {
+    type = 'iPhone'
+  }
+
   const results = []
 
   if (!gpu) {
@@ -42,7 +54,8 @@ function detectAppleDevice(gpu) {
     if (
       device.width !== width || 
       device.height !== height || 
-      device.pixelRatio !== pixelRatio
+      device.pixelRatio !== pixelRatio ||
+      device.type && device.type !== type
     ) {
       return
     }