From 4baf391efecd2406da747b5aafbfe6d517a5d043 Mon Sep 17 00:00:00 2001
From: dsehnal <david.sehnal@gmail.com>
Date: Mon, 8 Nov 2021 18:50:16 +0100
Subject: [PATCH] prefer webgl1 in safari 15.1 - WebGL2 is broken there for
Mol* shaders - It works again in Safari 15.4 tech preview
---
CHANGELOG.md | 1 +
src/mol-plugin/config.ts | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea2857d40..81e77c7e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Note that since we don't clearly distinguish between a public and private interf
- add binary model support
- add compartment (including membrane) geometry support
- add latest mycoplasma model example
+- Prefer WebGL1 in Safari 15.1.
## [v2.3.5] - 2021-10-19
diff --git a/src/mol-plugin/config.ts b/src/mol-plugin/config.ts
index bfd3b5aa3..ff101cfc3 100644
--- a/src/mol-plugin/config.ts
+++ b/src/mol-plugin/config.ts
@@ -20,9 +20,19 @@ export class PluginConfigItem<T = any> {
function item<T>(key: string, defaultValue?: T) { return new PluginConfigItem(key, defaultValue); }
-// adapted from https://stackoverflow.com/questions/9038625/detect-if-device-is-ios
-function is_iOS() {
+function preferWebGl1() {
if (typeof navigator === 'undefined' || typeof window === 'undefined') return false;
+
+ // WebGL2 isn't working in MacOS 12.0.1 Safari 15.1 (but is working in Safari tech preview)
+ // prefer webgl 1 based on the userAgent substring
+ if (navigator.userAgent.indexOf('Version/15.1 Safari') > 0) {
+ return true;
+ }
+
+ // Check for iOS device which enabled WebGL2 recently but it doesn't seem
+ // to be full up to speed yet.
+
+ // adapted from https://stackoverflow.com/questions/9038625/detect-if-device-is-ios
const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
const isAppleDevice = navigator.userAgent.includes('Macintosh');
const isTouchScreen = navigator.maxTouchPoints >= 4; // true for iOS 13 (and hopefully beyond)
@@ -41,7 +51,7 @@ export const PluginConfig = {
EnableWboit: item('plugin-config.enable-wboit', true),
// as of Oct 1 2021, WebGL 2 doesn't work on iOS 15.
// TODO: check back in a few weeks to see if it was fixed
- PreferWebGl1: item('plugin-config.prefer-webgl1', is_iOS()),
+ PreferWebGl1: item('plugin-config.prefer-webgl1', preferWebGl1()),
},
State: {
DefaultServer: item('plugin-state.server', 'https://webchem.ncbr.muni.cz/molstar-state'),
--
GitLab