Merge pull request #947 from OpenGeoscience/improve-gl-debug

Record the unmasked renderer used with webgl.
OpenGeoscience · Nov 2, 2018 · ea96ab1 · ea96ab1
2 parents 2d2a07e + bffe01e
commit ea96ab1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/gl/vglRenderer.js b/src/gl/vglRenderer.js
@@ -341,7 +341,14 @@ vglRenderer.supported = function () {
       canvas = document.createElement('canvas');
       ctx = (canvas.getContext('webgl') ||
              canvas.getContext('experimental-webgl'));
-      exts = ctx.getSupportedExtensions(); // used for side effects
+      /* getSupportExtensions will throw an exception if the context isn't
+       * really supported. */
+      exts = ctx.getSupportedExtensions();
+      /* If available, store the unmasked renderer to aid in debugging. */
+      if (exts.indexOf('WEBGL_debug_renderer_info') >= 0) {
+        vglRenderer._unmaskedRenderer = ctx.getParameter(ctx.getExtension(
+          'WEBGL_debug_renderer_info').UNMASKED_RENDERER_WEBGL);
+      }
       checkedWebGL = true;
     } catch (e) {
       console.warn('No webGL support');

diff --git a/src/util/mockVGL.js b/src/util/mockVGL.js
@@ -107,6 +107,10 @@ module.exports.mockVGLRenderer = function mockVGLRenderer(supported) {
         return true;
       }
     },
+    getSupportedExtensions: function () {
+      count('getSupportedExtensions');
+      return [];
+    },
     getUniformLocation: incID('getUniformLocation'),
     isEnabled: function (key) {
       count('isEnabled');