ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13492 from tschaub/bad-metal

Browse Source 
Workaround for Safari WebGL issue
This commit is contained in:
Tim Schaub
2022-03-20 15:48:20 -06:00
committed by GitHub
parent e10b7470a6 d7cb12a016
commit 2a6bbdb1ad
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/has.js
View File

@@ -19,6 +19,17 @@ export const FIREFOX = ua.indexOf('firefox') !== -1;
*/ */
export const SAFARI = ua.indexOf('safari') !== -1 && ua.indexOf('chrom') == -1; export const SAFARI = ua.indexOf('safari') !== -1 && ua.indexOf('chrom') == -1;
/**
* https://bugs.webkit.org/show_bug.cgi?id=237906
* @type {boolean}
*/
export const SAFARI_BUG_237906 =
SAFARI &&
!!(
ua.indexOf('version/15.4') >= 0 ||
ua.match(/cpu (os|iphone os) 15_4 like mac os x/)
);
/** /**
* User agent string says we are dealing with a WebKit engine. * User agent string says we are dealing with a WebKit engine.
* @type {boolean} * @type {boolean}

9
src/ol/webgl.js
View File

@@ -2,6 +2,7 @@
* @module ol/webgl * @module ol/webgl
*/ */
import {SAFARI_BUG_237906} from './has.js';
import {assign} from './obj.js'; import {assign} from './obj.js';
/** /**
@@ -91,7 +92,13 @@ const CONTEXT_IDS = ['experimental-webgl', 'webgl', 'webkit-3d', 'moz-webgl'];
* @return {WebGLRenderingContext} WebGL rendering context. * @return {WebGLRenderingContext} WebGL rendering context.
*/ */
export function getContext(canvas, opt_attributes) { export function getContext(canvas, opt_attributes) {
const attributes = assign({preserveDrawingBuffer: true}, opt_attributes); const attributes = assign(
{
preserveDrawingBuffer: true,
antialias: SAFARI_BUG_237906 ? false : true, // https://bugs.webkit.org/show_bug.cgi?id=237906
},
opt_attributes
);
const ii = CONTEXT_IDS.length; const ii = CONTEXT_IDS.length;
for (let i = 0; i < ii; ++i) { for (let i = 0; i < ii; ++i) {
try { try {