@luma.gl/webgl 8.5.10 → 8.5.13

package/src/classes/resource.js

@@ -13,6 +13,10 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
 // }
 
 export default class Resource {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'Resource';
+  }
   constructor(gl, opts = {}) {
     assertWebGLContext(gl);
 
@@ -21,7 +25,7 @@ export default class Resource {
     // @ts-ignore
     this.gl2 = gl;
     // this.ext = polyfillContext(gl);
-    this.id = id || uid(this.constructor.name);
+    this.id = id || uid(this[Symbol.toStringTag]);
     this.userData = userData;
     this._bound = false;
 
@@ -44,7 +48,7 @@ export default class Resource {
   }
 
   toString() {
-    return `${this.constructor.name}(${this.id})`;
+    return `${this[Symbol.toStringTag] || this.constructor.name}(${this.id})`;
   }
 
   get handle() {
@@ -275,7 +279,7 @@ export default class Resource {
   }
 
   _addStats() {
-    const name = this.constructor.name;
+    const name = this[Symbol.toStringTag];
     const stats = lumaStats.get('Resource Counts');
 
     stats.get('Resources Created').incrementCount();
@@ -284,13 +288,13 @@ export default class Resource {
   }
 
   _removeStats() {
-    const name = this.constructor.name;
+    const name = this[Symbol.toStringTag];
     const stats = lumaStats.get('Resource Counts');
 
     stats.get(`${name}s Active`).decrementCount();
   }
 
-  _trackAllocatedMemory(bytes, name = this.constructor.name) {
+  _trackAllocatedMemory(bytes, name = this[Symbol.toStringTag]) {
     const stats = lumaStats.get('Memory Usage');
 
     stats.get('GPU Memory').addCount(bytes);
@@ -298,7 +302,7 @@ export default class Resource {
     this.byteLength = bytes;
   }
 
-  _trackDeallocatedMemory(name = this.constructor.name) {
+  _trackDeallocatedMemory(name = this[Symbol.toStringTag]) {
     const stats = lumaStats.get('Memory Usage');
 
     stats.get('GPU Memory').subtractCount(this.byteLength);

package/src/classes/shader.js

@@ -9,6 +9,11 @@ const ERR_SOURCE = 'Shader: GLSL source code must be a JavaScript string';
 
 // For now this is an internal class
 export class Shader extends Resource {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'Shader';
+  }
+
   static getTypeName(shaderType) {
     switch (shaderType) {
       case GL.VERTEX_SHADER:
@@ -116,6 +121,11 @@ export class Shader extends Resource {
 }
 
 export class VertexShader extends Shader {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'VertexShader';
+  }
+
   constructor(gl, props) {
     // Signature: new VertexShader(gl, source)
     if (typeof props === 'string') {
@@ -131,6 +141,10 @@ export class VertexShader extends Shader {
 }
 
 export class FragmentShader extends Shader {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'FragmentShader';
+  }
   constructor(gl, props) {
     // Signature: new FragmentShader(gl, source)
     if (typeof props === 'string') {

package/src/classes/texture-2d.js

@@ -4,6 +4,11 @@ import Texture from './texture';
 import {loadImage} from '../utils/load-file';
 
 export default class Texture2D extends Texture {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'Texture2D';
+  }
+
   static isSupported(gl, opts) {
     return Texture.isSupported(gl, opts);
   }

package/src/classes/texture-3d.js

@@ -5,6 +5,11 @@ import {DATA_FORMAT_CHANNELS, TYPE_SIZES} from './texture-formats';
 import Buffer from './buffer';
 
 export default class Texture3D extends Texture {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'Texture3D';
+  }
+
   static isSupported(gl) {
     return isWebGL2(gl);
   }

package/src/classes/texture-cube.js

@@ -12,6 +12,11 @@ const FACES = [
 ];
 
 export default class TextureCube extends Texture {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'TextureCube';
+  }
+
   constructor(gl, props = {}) {
     assertWebGLContext(gl);
 

package/src/classes/texture.js

@@ -1,6 +1,5 @@
 import GL from '@luma.gl/constants';
 import {isWebGL2, assertWebGL2Context, withParameters, log} from '@luma.gl/gltools';
-import {global} from 'probe.gl/env';
 
 import Resource from './resource';
 import Buffer from './buffer';
@@ -19,9 +18,13 @@ const NPOT_MIN_FILTERS = [GL.LINEAR, GL.NEAREST];
 
 // Polyfill
 // Note (Tarek): Do we really need to support this API?
-const WebGLBuffer = global.WebGLBuffer || function WebGLBuffer() {};
+const WebGLBuffer = globalThis.WebGLBuffer || function WebGLBuffer() {};
 
 export default class Texture extends Resource {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'Texture';
+  }
   static isSupported(gl, opts = {}) {
     const {format, linearFiltering} = opts;
     let supported = true;
@@ -310,6 +313,8 @@ export default class Texture extends Resource {
 
     let gl2;
 
+    let compressedTextureSize = 0;
+
     withParameters(this.gl, parameters, () => {
       switch (dataType) {
         case 'null':
@@ -358,15 +363,17 @@ export default class Texture extends Resource {
               border,
               levelData.data
             );
+            compressedTextureSize += levelData.levelSize;
           }
-
           break;
         default:
           assert(false, 'Unknown image data type');
       }
     });
 
-    if (data && data.byteLength) {
+    if (dataType === 'compressed') {
+      this._trackAllocatedMemory(compressedTextureSize, 'Texture');
+    } else if (data && data.byteLength) {
       this._trackAllocatedMemory(data.byteLength, 'Texture');
     } else {
       // NOTE(Tarek): Default to RGBA bytes

package/src/classes/transform-feedback.js

@@ -8,6 +8,10 @@ import {isObjectEmpty} from '../utils/utils';
 // See https://github.com/KhronosGroup/WebGL/issues/2346
 
 export default class TransformFeedback extends Resource {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'TransformFeedback';
+  }
   static isSupported(gl) {
     return isWebGL2(gl);
   }

package/src/classes/vertex-array-object.js

@@ -9,6 +9,10 @@ import {getBrowser} from 'probe.gl';
 const ERR_ELEMENTS = 'elements must be GL.ELEMENT_ARRAY_BUFFER';
 
 export default class VertexArrayObject extends Resource {
+  // eslint-disable-next-line accessor-pairs
+  get [Symbol.toStringTag]() {
+    return 'VertexArrayObject';
+  }
   static isSupported(gl, options = {}) {
     // Attribute 0 can not be disable on most desktop OpenGL based browsers
     // and on iOS Safari browser.

package/src/init.js

@@ -1,6 +1,6 @@
 import {log} from '@luma.gl/gltools';
 import {Stats} from 'probe.gl';
-import {isBrowser, global} from 'probe.gl/env';
+import {isBrowser} from '@probe.gl/env';
 
 // Version detection using babel plugin
 /* global __VERSION__ */
@@ -28,16 +28,16 @@ class StatsManager {
 
 const lumaStats = new StatsManager();
 
-if (global.luma && global.luma.VERSION !== VERSION) {
-  throw new Error(`luma.gl - multiple VERSIONs detected: ${global.luma.VERSION} vs ${VERSION}`);
+if (globalThis.luma && globalThis.luma.VERSION !== VERSION) {
+  throw new Error(`luma.gl - multiple VERSIONs detected: ${globalThis.luma.VERSION} vs ${VERSION}`);
 }
 
-if (!global.luma) {
+if (!globalThis.luma) {
   if (isBrowser()) {
     log.log(1, `luma.gl ${VERSION} - ${STARTUP_MESSAGE}`)();
   }
 
-  global.luma = global.luma || {
+  globalThis.luma = globalThis.luma || {
     VERSION,
     version: VERSION,
     log,
@@ -59,4 +59,4 @@ if (!global.luma) {
 }
 
 export {lumaStats};
-export default global.luma;
+export default globalThis.luma;

package/src/utils/is-old-ie.js

@@ -1,4 +1,4 @@
-import {getBrowser} from 'probe.gl/env';
+import {getBrowser} from '@probe.gl/env';
 
 // opts allows user agent to be overridden for testing
 export function isOldIE(opts = {}) {