Skip to content

Commit 057ecdf

Browse files
tweak
1 parent 8694cb7 commit 057ecdf

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

js/webgl.js

+32-16
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ function getWebGL(contextType) {
236236
}
237237
}
238238
} catch (e) {
239-
log_error(10, contextType, e)
240-
errors.push('context blocked')
239+
errors.push(['context', e+'']) // 'context blocked'
241240
return [data, errors]
242241
}
243242

@@ -247,9 +246,8 @@ function getWebGL(contextType) {
247246
let webGLExtensions
248247
try {
249248
webGLExtensions = context.getSupportedExtensions()
250-
} catch (error) {
251-
console.error(error)
252-
errors.push('extensions blocked')
249+
} catch (e) {
250+
errors.push(['extensions', e+'']) // 'extensions blocked'
253251
}
254252

255253
// get parameters
@@ -296,13 +294,13 @@ function getWebGL(contextType) {
296294

297295
parameters.DIRECT_3D = /Direct3D|D3D(\d+)/.test(parameters.UNMASKED_RENDERER_WEBGL)
298296

299-
} catch (error) {
300-
console.error(error)
301-
errors.push('parameters blocked')
297+
} catch (e) {
298+
log_error(10, contextType, e)
299+
errors.push(['parameters', e+'']) // 'parameters blocked'
302300
}
303301

304-
//const gpuVendor = parameters.UNMASKED_VENDOR_WEBGL
305-
//const gpuRenderer = parameters.UNMASKED_RENDERER_WEBGL
302+
const gpuVendor = parameters.UNMASKED_VENDOR_WEBGL
303+
const gpuRenderer = parameters.UNMASKED_RENDERER_WEBGL
306304

307305
// Structure parameter data
308306
let components = {}
@@ -322,36 +320,54 @@ function getWebGL(contextType) {
322320
}
323321

324322
data = {
325-
//gpuRenderer,
326-
//gpuVendor,
323+
gpuRenderer,
324+
gpuVendor,
327325
...components,
328326
webGLExtensions
329327
}
330328
return [data, errors]
331329
}
332330

333331
const outputWebGL = () => new Promise(resolve => {
334-
return resolve()
332+
//return resolve()
335333

336334
Promise.all([
337335
getWebGL('webgl'),
338336
getWebGL('webgl2'),
339337
getWebGL('experimental-webgl'),
340338
]).then((response) => {
339+
341340
const [webGL, webGL2, experimentalWebGL] = response
342341
const [webGLData, webGLErrors] = webGL
343342
const [webGL2Data, webGL2Errors] = webGL2
344343
const [experimentalWebGLData, experimentalWebGLErrors] = experimentalWebGL
345344

346-
/*
347-
console.log('WebGLRenderingContext: ', mini(webGLData), webGLData)
345+
//*
346+
console.log('WebGL: ', mini(webGLData), webGLData)
348347
if (webGLErrors.length) {console.log('webGL Errors',webGLErrors)}
349-
console.log('WebGL2RenderingContext: ', webGL2Data)
348+
console.log('WebGL2: ', mini(webGL2Data), webGL2Data)
350349
if (webGL2Errors.length) {console.log('webGL2 Errors',webGL2Errors)}
351350
console.log('Experimental: ', mini(experimentalWebGLData), experimentalWebGLData)
352351
if (experimentalWebGLErrors.length) {console.log('Experimental Errors',experimentalWebGLErrors)}
353352
//*/
354353

354+
/*
355+
RENDERER: ANGLE (NVIDIA, NVIDIA GeForce GTX 980 Direct3D11 vs_5_0 ps_5_0), or similar
356+
UNMASKED_RENDERER_WEBGL: ANGLE (NVIDIA, NVIDIA GeForce GTX 980 Direct3D11 vs_5_0 ps_5_0), or similar
357+
UNMASKED_VENDOR_WEBGL: Google Inc. (NVIDIA)
358+
VENDOR: Mozilla
359+
*/
360+
361+
// check for NS click to play
362+
let nsClickToPlay = false
363+
try {
364+
nsClickToPlay = !!document.querySelector('.__ns__pop2top [data-policy-type="webgl"]')
365+
} catch(e) {
366+
log_error(10, 'webgl_ns_clicktoplay', e)
367+
nsClickToPlay = zErr
368+
}
369+
console.log('WebGL ClickToPlay', nsClickToPlay)
370+
355371
// do something with the erorrs...
356372
return resolve()
357373

0 commit comments

Comments
 (0)