@luma.gl/webgl 8.5.16 → 8.5.18

package/src/classes/resource.js

@@ -1,5 +1,5 @@
 import {isWebGL2, assertWebGLContext} from '@luma.gl/gltools';
-import {lumaStats, StatsManager} from '../init';
+import {lumaStats} from '../init';
 import {getKey, getKeyValue} from '../webgl-utils/constants-to-keys';
 import {assert} from '../utils/assert';
 import {uid} from '../utils/utils';
@@ -44,7 +44,6 @@ export default class Resource {
     // Only meaningful for resources that allocate GPU memory
     this.byteLength = 0;
 
-    this._initStats();
     this._addStats();
   }
 
@@ -279,10 +278,6 @@ export default class Resource {
     return this.gl.luma;
   }
 
-  _initStats() {
-    this.gl.stats = this.gl.stats || new StatsManager();
-  }
-
   _addStats() {
     const name = this[Symbol.toStringTag];
     const stats = lumaStats.get('Resource Counts');
@@ -299,32 +294,37 @@ export default class Resource {
     stats.get(`${name}s Active`).decrementCount();
   }
 
+  /**
+   * Track common allocated memory and memory based on particular gl context.
+   * @param {number} bytes
+   * @param {string} name
+   */
   _trackAllocatedMemory(bytes, name = this[Symbol.toStringTag]) {
-    this._doTrackAllocatedMemory(bytes, name);
-    this._doTrackAllocatedMemory(bytes, name, this.gl.stats.get(`Memory Usage`));
+    this._trackAllocatedMemoryForContext(bytes, name);
+    this._trackAllocatedMemoryForContext(bytes, name, this.gl.canvas && this.gl.canvas.id);
+    this.byteLength = bytes;
   }
 
-  _doTrackAllocatedMemory(
-    bytes,
-    name = this[Symbol.toStringTag],
-    stats = lumaStats.get(`Memory Usage`)
-  ) {
+  _trackAllocatedMemoryForContext(bytes, name = this[Symbol.toStringTag], id = '') {
+    const stats = lumaStats.get(`Memory Usage${id}`);
     stats.get('GPU Memory').addCount(bytes);
     stats.get(`${name} Memory`).addCount(bytes);
-    this.byteLength = bytes;
   }
 
+  /**
+   * Deallocate memory for common statistic and for each gl context as well.
+   * @param {string} name
+   */
   _trackDeallocatedMemory(name = this[Symbol.toStringTag]) {
-    this._doTrackDeallocatedMemory(name);
-    this._doTrackDeallocatedMemory(name, this.gl.stats.get(`Memory Usage`));
+    this._trackDeallocatedMemoryForContext(name);
+    this._trackDeallocatedMemoryForContext(name, this.gl.canvas && this.gl.canvas.id);
+    this.byteLength = 0;
   }
 
-  _doTrackDeallocatedMemory(
-    name = this[Symbol.toStringTag],
-    stats = lumaStats.get(`Memory Usage`)
-  ) {
+  _trackDeallocatedMemoryForContext(name = this[Symbol.toStringTag], id = '') {
+    const stats = lumaStats.get(`Memory Usage${id}`);
+
     stats.get('GPU Memory').subtractCount(this.byteLength);
     stats.get(`${name} Memory`).subtractCount(this.byteLength);
-    this.byteLength = 0;
   }
 }