@luma.gl/webgl 9.0.0-alpha.3 → 9.0.0-alpha.30

package/dist/adapter/objects/webgl-vertex-array-object.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/objects/webgl-vertex-array-object.ts"],"names":["assert","GL","getBrowser","WebGLResource","ERR_ELEMENTS","WEBGLVertexArrayObject","Symbol","toStringTag","constructor","device","props","_createHandle","gl2","createVertexArray","_deleteHandle","deleteVertexArray","handle","elements","_bindHandle","bindVertexArray","setElementBuffer","elementBuffer","opts","target","ELEMENT_ARRAY_BUFFER","bind","gl","bindBuffer","setBuffer","location","buffer","accessor","size","type","stride","offset","normalized","integer","divisor","Number","ARRAY_BUFFER","assertWebGL2","vertexAttribIPointer","vertexAttribPointer","enableVertexAttribArray","vertexAttribDivisor","enable","canDisableAttributeZero","isWebGL2","canDisableAttribute","disableVertexAttribArray"],"mappings":"AAAA,SAAQA,MAAR,QAAoC,cAApC;AACA,OAAOC,EAAP,MAAe,oBAAf;AACA,SAAQC,UAAR,QAAyB,eAAzB;AAGA,OAAOC,aAAP,MAA0B,kBAA1B;AAIA,MAAMC,YAAY,GAAG,0CAArB;AASA,eAAe,MAAMC,sBAAN,SAAqCF,aAArC,CAA2E;AACjE,OAAlBG,MAAM,CAACC,WAAW,IAAY;AACjC,WAAO,uBAAP;AACD;;AAEDC,EAAAA,WAAW,CAACC,MAAD,EAAsBC,KAAtB,EAAsD;AAE/D,UAAMD,MAAN,EAAcC,KAAd,EAAqB,EAArB;AACD;;AAEDC,EAAAA,aAAa,GAAG;AACd,WAAO,KAAKC,GAAL,CAASC,iBAAT,EAAP;AACD;;AAEDC,EAAAA,aAAa,GAAS;AACpB,SAAKF,GAAL,CAASG,iBAAT,CAA2B,KAAKC,MAAhC;AAEA,WAAO,CAAC,KAAKC,QAAN,CAAP;AAED;;AAEDC,EAAAA,WAAW,CAACF,MAAD,EAAuC;AAChD,SAAKJ,GAAL,CAASO,eAAT,CAAyBH,MAAzB;AACD;;AAIDI,EAAAA,gBAAgB,CAACC,aAAqB,GAAG,IAAzB,EAA+BC,IAAI,GAAG,EAAtC,EAA0C;AACxDtB,IAAAA,MAAM,CAAC,CAACqB,aAAD,IAAkBA,aAAa,CAACE,MAAd,KAAyBtB,EAAE,CAACuB,oBAA/C,EAAqEpB,YAArE,CAAN;AAGA,SAAKqB,IAAL,CAAU,MAAM;AACd,WAAKC,EAAL,CAAQC,UAAR,CAAmB1B,EAAE,CAACuB,oBAAtB,EAA4CH,aAAa,GAAGA,aAAa,CAACL,MAAjB,GAA0B,IAAnF;AACD,KAFD;AAIA,WAAO,IAAP;AACD;;AAGDY,EAAAA,SAAS,CAACC,QAAD,EAAmBC,MAAnB,EAAmCC,QAAnC,EAAwD;AAE/D,QAAID,MAAM,CAACP,MAAP,KAAkBtB,EAAE,CAACuB,oBAAzB,EAA+C;AAC7C,aAAO,KAAKJ,gBAAL,CAAsBU,MAAtB,EAA8BC,QAA9B,CAAP;AACD;;AAED,UAAM;AAACC,MAAAA,IAAD;AAAOC,MAAAA,IAAP;AAAaC,MAAAA,MAAb;AAAqBC,MAAAA,MAArB;AAA6BC,MAAAA,UAA7B;AAAyCC,MAAAA,OAAzC;AAAkDC,MAAAA;AAAlD,QAA6DP,QAAnE;AAEA,UAAM;AAACL,MAAAA,EAAD;AAAKd,MAAAA;AAAL,QAAY,IAAlB;AACAiB,IAAAA,QAAQ,GAAGU,MAAM,CAACV,QAAD,CAAjB;AAEA,SAAKJ,IAAL,CAAU,MAAM;AAEdC,MAAAA,EAAE,CAACC,UAAH,CAAcD,EAAE,CAACc,YAAjB,EAA+BV,MAAM,CAACd,MAAtC;;AAGA,UAAIqB,OAAJ,EAAa;AACX,aAAK5B,MAAL,CAAYgC,YAAZ;AACA7B,QAAAA,GAAG,CAAC8B,oBAAJ,CAAyBb,QAAzB,EAAmCG,IAAnC,EAAyCC,IAAzC,EAA+CC,MAA/C,EAAuDC,MAAvD;AACD,OAHD,MAGO;AAELT,QAAAA,EAAE,CAACiB,mBAAH,CAAuBd,QAAvB,EAAiCG,IAAjC,EAAuCC,IAAvC,EAA6CG,UAA7C,EAAyDF,MAAzD,EAAiEC,MAAjE;AACD;;AACDT,MAAAA,EAAE,CAACkB,uBAAH,CAA2Bf,QAA3B;AACAjB,MAAAA,GAAG,CAACiC,mBAAJ,CAAwBhB,QAAxB,EAAkCS,OAAO,IAAI,CAA7C;AAGD,KAhBD;AAkBA,WAAO,IAAP;AACD;;AAQDQ,EAAAA,MAAM,CAACjB,QAAD,EAAmBiB,MAAM,GAAG,IAA5B,EAAwC;AAE5C,UAAMC,uBAAuB,GAAG,KAAKtC,MAAL,CAAYuC,QAAZ,IAAwB9C,UAAU,OAAO,QAAzE;AACA,UAAM+C,mBAAmB,GAAGF,uBAAuB,IAAIlB,QAAQ,KAAK,CAApE;;AAEA,QAAIiB,MAAM,IAAIG,mBAAd,EAAmC;AACjCpB,MAAAA,QAAQ,GAAGU,MAAM,CAACV,QAAD,CAAjB;AACA,WAAKJ,IAAL,CAAU,MACRqB,MAAM,GACF,KAAKpB,EAAL,CAAQkB,uBAAR,CAAgCf,QAAhC,CADE,GAEF,KAAKH,EAAL,CAAQwB,wBAAR,CAAiCrB,QAAjC,CAHN;AAKD;;AACD,WAAO,IAAP;AACD;;AA3FuF","sourcesContent":["import {assert, ResourceProps} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport {getBrowser} from '@probe.gl/env';\n\nimport WebGLDevice from '../webgl-device';\nimport WebGLResource from './webgl-resource';\n\nimport Buffer from '../resources/webgl-buffer';\n\nconst ERR_ELEMENTS = 'elements must be GL.ELEMENT_ARRAY_BUFFER';\n\n/**\n * VertexArrayObject properties\n */\nexport type VertexArrayObjectProps = ResourceProps & {\n};\n\n/** VertexArrayObject wrapper */\nexport default class WEBGLVertexArrayObject extends WebGLResource<VertexArrayObjectProps> {\n  get [Symbol.toStringTag](): string {\n    return 'BaseVertexArrayObject';\n  }\n\n  constructor(device: WebGLDevice, props?: VertexArrayObjectProps) {\n    // @ts-expect-error\n    super(device, props, {});\n  }\n\n  _createHandle() {\n    return this.gl2.createVertexArray();\n  }\n\n  _deleteHandle(): void {\n    this.gl2.deleteVertexArray(this.handle);\n    // @ts-expect-error\n    return [this.elements];\n    // return [this.elements, ...this.buffers];\n  }\n\n  _bindHandle(handle: WEBGLVertexArrayObject): void {\n    this.gl2.bindVertexArray(handle);\n  }\n\n  // Set (bind) an elements buffer, for indexed rendering.\n  // Must be a Buffer bound to GL.ELEMENT_ARRAY_BUFFER. Constants not supported\n  setElementBuffer(elementBuffer: Buffer = null, opts = {}) {\n    assert(!elementBuffer || elementBuffer.target === GL.ELEMENT_ARRAY_BUFFER, ERR_ELEMENTS);\n\n    // The GL.ELEMENT_ARRAY_BUFFER_BINDING is stored on the VertexArrayObject...\n    this.bind(() => {\n      this.gl.bindBuffer(GL.ELEMENT_ARRAY_BUFFER, elementBuffer ? elementBuffer.handle : null);\n    });\n\n    return this;\n  }\n\n  /** Set a location in vertex attributes array to a buffer, enables the location, sets divisor */\n  setBuffer(location: number, buffer: Buffer, accessor: any): this {\n    // Check target\n    if (buffer.target === GL.ELEMENT_ARRAY_BUFFER) {\n      return this.setElementBuffer(buffer, accessor);\n    }\n\n    const {size, type, stride, offset, normalized, integer, divisor} = accessor;\n\n    const {gl, gl2} = this;\n    location = Number(location);\n\n    this.bind(() => {\n      // A non-zero buffer object must be bound to the GL_ARRAY_BUFFER target\n      gl.bindBuffer(gl.ARRAY_BUFFER, buffer.handle);\n\n      // WebGL2 supports *integer* data formats, i.e. GPU will see integer values\n      if (integer) {\n        this.device.assertWebGL2();\n        gl2.vertexAttribIPointer(location, size, type, stride, offset);\n      } else {\n        // Attaches ARRAY_BUFFER with specified buffer format to location\n        gl.vertexAttribPointer(location, size, type, normalized, stride, offset);\n      }\n      gl.enableVertexAttribArray(location);\n      gl2.vertexAttribDivisor(location, divisor || 0);\n\n      // NOTE We don't unbind buffer here, typically another buffer will be bound just after\n    });\n\n    return this;\n  }\n\n  /**\n   * Enabling an attribute location makes it reference the currently bound buffer\n   *  Disabling an attribute location makes it reference the global constant value\n   * TODO - handle single values for size 1 attributes?\n   * TODO - convert classic arrays based on known type?\n   */\n  enable(location: number, enable = true): this {\n    // Attribute 0 cannot be disabled in most desktop OpenGL based browsers...\n    const canDisableAttributeZero = this.device.isWebGL2 || getBrowser() === 'Chrome';\n    const canDisableAttribute = canDisableAttributeZero || location !== 0;\n\n    if (enable || canDisableAttribute) {\n      location = Number(location);\n      this.bind(() =>\n        enable\n          ? this.gl.enableVertexAttribArray(location)\n          : this.gl.disableVertexAttribArray(location)\n      );\n    }\n    return this;\n  }\n}\n"],"file":"webgl-vertex-array-object.js"}
+{"version":3,"file":"webgl-vertex-array-object.js","names":["Resource","assert","getScratchArray","fillArray","GL","getBrowser","WebGLResource","ERR_ELEMENTS","_Symbol$toStringTag","Symbol","toStringTag","WEBGLVertexArrayObject","isConstantAttributeZeroSupported","device","info","type","constructor","props","defaultProps","constantAttributeZero","_defineProperty","Object","seal","destroy","buffer","_this$buffer","_createHandle","gl2","createVertexArray","_deleteHandle","deleteVertexArray","handle","elements","_bindHandle","bindVertexArray","enable","location","arguments","length","undefined","canDisableAttributeZero","isWebGL2","canDisableAttribute","Number","bind","gl","enableVertexAttribArray","disableVertexAttribArray","setElementBuffer","elementBuffer","opts","glTarget","ELEMENT_ARRAY_BUFFER","bindBuffer","setBuffer","accessor","size","stride","offset","normalized","integer","divisor","ARRAY_BUFFER","assertWebGL2","vertexAttribIPointer","vertexAttribPointer","vertexAttribDivisor","setConstant","array","Float32Array","setConstantFloatArray","Int32Array","setConstantIntArray","Uint32Array","setConstantUintArray","getConstantBuffer","elementCount","value","constantValue","normalizeConstantArrayValue","byteLength","updateNeeded","createBuffer","reallocate","compareConstantArrayValues","bufferValue","typedArray","target","source","start","count","subData","vertexAttrib1fv","vertexAttrib2fv","vertexAttrib3fv","vertexAttrib4fv","_device$gl","vertexAttribI4iv","_device$gl2","vertexAttribI4uiv","arrayValue","Array","isArray","v1","v2","i"],"sources":["../../../src/adapter/objects/webgl-vertex-array-object.ts"],"sourcesContent":["import type {Device, Buffer, ResourceProps, TypedArray, NumericArray} from '@luma.gl/core';\nimport {Resource, assert, getScratchArray, fillArray} from '@luma.gl/core';\nimport {GL} from '@luma.gl/constants';\nimport {getBrowser} from '@probe.gl/env';\n\nimport {WebGLDevice} from '../webgl-device';\nimport {WebGLResource} from './webgl-resource';\nimport {WEBGLBuffer} from '../resources/webgl-buffer';\n\nimport {BufferWithAccessor} from '../../classic/buffer-with-accessor';\n\nconst ERR_ELEMENTS = 'elements must be GL.ELEMENT_ARRAY_BUFFER';\n\n/**\n * VertexArrayObject properties\n * @param constantAttributeZero Attribute 0 can not be disable on most desktop OpenGL based browsers\n * and on iOS Safari browser.\n */\nexport type VertexArrayObjectProps = ResourceProps & {\n  constantAttributeZero?: boolean;\n};\n\n/** VertexArrayObject wrapper */\nexport class WEBGLVertexArrayObject extends WebGLResource<VertexArrayObjectProps> {\n  override get [Symbol.toStringTag](): string {\n    return 'BaseVertexArrayObject';\n  }\n\n  /** Buffer constant */\n  private buffer: BufferWithAccessor | null = null;\n  private bufferValue = null;\n\n  static isConstantAttributeZeroSupported(device: Device): boolean {\n    return device.info.type === 'webgl2' || getBrowser() === 'Chrome';\n  }\n\n  // Create a VertexArray\n  constructor(device: Device, props?: VertexArrayObjectProps) {\n    super(device, props, {...Resource.defaultProps, constantAttributeZero: false});\n    Object.seal(this);\n  }\n\n  override destroy(): void {\n    super.destroy();\n    if (this.buffer) {\n      this.buffer?.destroy();\n    }  }\n\n  override _createHandle() {\n    return this.gl2.createVertexArray();\n  }\n\n  override _deleteHandle(): void {\n    this.gl2.deleteVertexArray(this.handle);\n    // @ts-expect-error\n    return [this.elements];\n    // return [this.elements, ...this.buffers];\n  }\n\n  override _bindHandle(handle: WEBGLVertexArrayObject): void {\n    this.gl2.bindVertexArray(handle);\n  }\n\n  /**\n   * Enabling an attribute location makes it reference the currently bound buffer\n   *  Disabling an attribute location makes it reference the global constant value\n   * TODO - handle single values for size 1 attributes?\n   * TODO - convert classic arrays based on known type?\n   */\n  enable(location: number, enable = true): void {\n    // Attribute 0 cannot be disabled in most desktop OpenGL based browsers...\n    const canDisableAttributeZero = this.device.isWebGL2 || getBrowser() === 'Chrome';\n    const canDisableAttribute = canDisableAttributeZero || location !== 0;\n\n    if (enable || canDisableAttribute) {\n      location = Number(location);\n      this.bind(() =>\n        enable\n          ? this.gl.enableVertexAttribArray(location)\n          : this.gl.disableVertexAttribArray(location)\n      );\n    }  }\n\n  // Set (bind) an elements buffer, for indexed rendering.\n  // Must be a Buffer bound to GL.ELEMENT_ARRAY_BUFFER. Constants not supported\n  setElementBuffer(elementBuffer: WEBGLBuffer | null = null, opts = {}) {\n    assert(!elementBuffer || elementBuffer.glTarget === GL.ELEMENT_ARRAY_BUFFER, ERR_ELEMENTS);\n\n    // The GL.ELEMENT_ARRAY_BUFFER_BINDING is stored on the VertexArrayObject...\n    this.bind(() => {\n      this.gl.bindBuffer(GL.ELEMENT_ARRAY_BUFFER, elementBuffer ? elementBuffer.handle : null);\n    });\n  }\n\n  /** Set a location in vertex attributes array to a buffer, enables the location, sets divisor */\n  setBuffer(location: number, buffer: WEBGLBuffer, accessor: any): void {\n    // Check target\n    if (buffer.glTarget === GL.ELEMENT_ARRAY_BUFFER) {\n      this.setElementBuffer(buffer, accessor);\n      return;\n    }\n\n    const {size, type, stride, offset, normalized, integer, divisor} = accessor;\n\n    const {gl, gl2} = this;\n    location = Number(location);\n\n    this.bind(() => {\n      // A non-zero buffer object must be bound to the GL_ARRAY_BUFFER target\n      gl.bindBuffer(gl.ARRAY_BUFFER, buffer.handle);\n\n      // WebGL2 supports *integer* data formats, i.e. GPU will see integer values\n      if (integer) {\n        this.device.assertWebGL2();\n        gl2.vertexAttribIPointer(location, size, type, stride, offset);\n      } else {\n        // Attaches ARRAY_BUFFER with specified buffer format to location\n        gl.vertexAttribPointer(location, size, type, normalized, stride, offset);\n      }\n      gl.enableVertexAttribArray(location);\n      gl2.vertexAttribDivisor(location, divisor || 0);\n\n      // NOTE We don't unbind buffer here, typically another buffer will be bound just after\n    });\n  }\n\n  /**\n   * Set an attribute to a constant value\n   * @param device\n   * @param location\n   * @param array\n   * \n   * @note Constants are stored globally on the WebGL context, not the VAO\n   * so they need to be updated before every render\n   * @todo - use known type (in configuration or passed in) to allow non-typed arrays?\n   * @todo - remember/cache values to avoid setting them unnecessarily?\n   */\n  setConstant(location: any, array: TypedArray): void {\n    switch (array.constructor) {\n      case Float32Array:\n        setConstantFloatArray(this.device, location, array as Float32Array);\n        break;\n      case Int32Array:\n        setConstantIntArray(this.device, location, array as Int32Array);\n        break;\n      case Uint32Array:\n        setConstantUintArray(this.device, location, array as Uint32Array);\n        break;\n      default:\n        assert(false);\n    }\n  }\n\n  /**\n   * Provide a means to create a buffer that is equivalent to a constant.\n   * NOTE: Desktop OpenGL cannot disable attribute 0.\n   * https://stackoverflow.com/questions/20305231/webgl-warning-attribute-0-is-disabled-\n   * this-has-significant-performance-penalty\n   */\n  getConstantBuffer(elementCount: number, value): Buffer {\n    // Create buffer only when needed, and reuse it (avoids inflating buffer creation statistics)\n\n    const constantValue = normalizeConstantArrayValue(value);\n\n    const byteLength = constantValue.byteLength * elementCount;\n    const length = constantValue.length * elementCount;\n\n    let updateNeeded = !this.buffer;\n\n    this.buffer = this.buffer || this.device.createBuffer({byteLength}) as BufferWithAccessor;\n    updateNeeded = updateNeeded || this.buffer.reallocate(byteLength);\n\n    // Reallocate and update contents if needed\n    updateNeeded =\n      updateNeeded || !compareConstantArrayValues(constantValue, this.bufferValue);\n\n    if (updateNeeded) {\n      // Create a typed array that is big enough, and fill it with the required data\n      const typedArray = getScratchArray(value.constructor, length);\n      fillArray({target: typedArray, source: constantValue, start: 0, count: length});\n      this.buffer.subData(typedArray);\n      this.bufferValue = value;\n    }\n\n    return this.buffer;\n  }\n}\n\nfunction setConstantFloatArray(device: WebGLDevice, location: number, array: Float32Array): void {\n  switch (array.length) {\n    case 1:\n      device.gl.vertexAttrib1fv(location, array);\n      break;\n    case 2:\n      device.gl.vertexAttrib2fv(location, array);\n      break;\n    case 3:\n      device.gl.vertexAttrib3fv(location, array);\n      break;\n    case 4:\n      device.gl.vertexAttrib4fv(location, array);\n      break;\n    default:\n      assert(false);\n  }\n}\n\nfunction setConstantIntArray(device: WebGLDevice, location: number, array: Int32Array): void {\n  device.assertWebGL2();\n  device.gl2?.vertexAttribI4iv(location, array);\n  // switch (array.length) {\n  //   case 1:\n  //     gl.vertexAttribI1iv(location, array);\n  //     break;\n  //   case 2:\n  //     gl.vertexAttribI2iv(location, array);\n  //     break;\n  //   case 3:\n  //     gl.vertexAttribI3iv(location, array);\n  //     break;\n  //   case 4:\n  //     break;\n  //   default:\n  //     assert(false);\n  // }\n}\n\nfunction setConstantUintArray(device: WebGLDevice, location: number, array: Uint32Array) {\n  device.assertWebGL2();\n  device.gl2?.vertexAttribI4uiv(location, array);\n  // switch (array.length) {\n  //   case 1:\n  //     gl.vertexAttribI1uiv(location, array);\n  //     break;\n  //   case 2:\n  //     gl.vertexAttribI2uiv(location, array);\n  //     break;\n  //   case 3:\n  //     gl.vertexAttribI3uiv(location, array);\n  //     break;\n  //   case 4:\n  //     gl.vertexAttribI4uiv(location, array);\n  //     break;\n  //   default:\n  //     assert(false);\n  // }\n}\n\n// HELPERS\n\n/**\n * TODO - convert Arrays based on known type? (read type from accessor, don't assume Float32Array)\n * TODO - handle single values for size 1 attributes?\n */\nfunction normalizeConstantArrayValue(arrayValue: NumericArray) {\n  if (Array.isArray(arrayValue)) {\n    return new Float32Array(arrayValue);\n  }\n  return arrayValue;\n}\n\n/**\n * \n */\nfunction compareConstantArrayValues(v1: NumericArray, v2: NumericArray): boolean {\n  if (!v1 || !v2 || v1.length !== v2.length || v1.constructor !== v2.constructor) {\n    return false;\n  }\n  for (let i = 0; i < v1.length; ++i) {\n    if (v1[i] !== v2[i]) {\n      return false;\n    }\n  }\n  return true;\n}\n"],"mappings":"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"}

package/dist/adapter/resources/webgl-buffer.d.ts

@@ -1,19 +1,27 @@
-import type { BufferProps } from '@luma.gl/api';
-import { Buffer } from '@luma.gl/api';
-import WebGLDevice from '../webgl-device';
+import type { BufferProps } from '@luma.gl/core';
+import { Buffer } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { WebGLDevice } from '../webgl-device';
 /** WebGL Buffer interface */
-export default class WEBGLBuffer extends Buffer {
+export declare class WEBGLBuffer extends Buffer {
     readonly device: WebGLDevice;
     readonly gl: WebGLRenderingContext;
     readonly gl2: WebGL2RenderingContext | null;
     readonly handle: WebGLBuffer;
-    readonly target: number;
+    /** Target in OpenGL defines the type of buffer */
+    readonly glTarget: GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.UNIFORM_BUFFER;
+    /** Usage is a hint on how frequently the buffer will be updates */
+    readonly glUsage: GL.STATIC_DRAW | GL.DYNAMIC_DRAW;
+    /** Index type is needed when issuing draw calls, so we pre-compute it */
+    readonly glIndexType: GL.UNSIGNED_SHORT | GL.UNSIGNED_INT;
+    /** Number of bytes allocated on the GPU for this buffer */
     byteLength: number;
+    /** Number of bytes used */
     bytesUsed: number;
-    debugData: ArrayBuffer;
-    webglUsage: number;
-    accessor: {};
+    /** A partial CPU-side copy of the data in this buffer, for debugging purposes */
+    debugData: ArrayBuffer | null;
     constructor(device: WebGLDevice, props?: BufferProps);
+    /** Allocate a new buffer and initialize to contents of typed array */
     _initWithData(data: any, byteOffset?: number, byteLength?: number): this;
     _initWithByteLength(byteLength: number): this;
     destroy(): void;
@@ -21,7 +29,7 @@ export default class WEBGLBuffer extends Buffer {
     /** Read data from the buffer */
     readAsync(byteOffset?: number, byteLength?: number): Promise<ArrayBuffer>;
     _invalidateDebugData(): void;
-    _getWriteTarget(): number;
-    _getReadTarget(): number;
+    _getWriteTarget(): GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.UNIFORM_BUFFER;
+    _getReadTarget(): GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.UNIFORM_BUFFER;
 }
 //# sourceMappingURL=webgl-buffer.d.ts.map

package/dist/adapter/resources/webgl-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAS,MAAM,cAAc,CAAC;AAE5C,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAI1C,6BAA6B;AAC7B,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,MAAM;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,qBAAqB,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,WAAW,CAAC;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,EAAE,CAAC;gBAED,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IAqCxD,aAAa,CAAC,IAAI,KAAA,EAAE,UAAU,GAAE,MAAU,EAAE,UAAU,GAAE,MAAqC,GAAG,IAAI;IAmBpG,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAwB7C,OAAO,IAAI,IAAI;IAUf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAuB1D,gCAAgC;IAC1B,SAAS,CACb,UAAU,GAAE,MAAU,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,WAAW,CAAC;IAmBvB,oBAAoB;IAIpB,eAAe;IAKf,cAAc;CAIf"}
+{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAS,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAI5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,qBAAqB,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,cAAc,CAAC;IACjF,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC;IACnD,yEAAyE;IACzE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,YAAY,CAAqB;IAE9E,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,iFAAiF;IACjF,SAAS,EAAE,WAAW,GAAG,IAAI,CAAQ;gBAEzB,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA8BxD,sEAAsE;IACtE,aAAa,CAAC,IAAI,KAAA,EAAE,UAAU,GAAE,MAAU,EAAE,UAAU,GAAE,MAAqC,GAAG,IAAI;IAkBpG,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAwBpC,OAAO,IAAI,IAAI;IAWf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAqBnE,gCAAgC;IACjB,SAAS,CACtB,UAAU,GAAE,MAAU,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,WAAW,CAAC;IAmBvB,oBAAoB;IAIpB,eAAe;IAKf,cAAc;CAIf"}

package/dist/adapter/resources/webgl-buffer.js

@@ -1,111 +1,96 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { Buffer, assert } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
+import { Buffer, assert } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
 const DEBUG_DATA_LENGTH = 10;
-export default class WEBGLBuffer extends Buffer {
-  constructor(device, props = {}) {
+export class WEBGLBuffer extends Buffer {
+  constructor(device) {
+    let props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     super(device, props);
-
     _defineProperty(this, "device", void 0);
-
     _defineProperty(this, "gl", void 0);
-
     _defineProperty(this, "gl2", void 0);
-
     _defineProperty(this, "handle", void 0);
-
-    _defineProperty(this, "target", void 0);
-
+    _defineProperty(this, "glTarget", void 0);
+    _defineProperty(this, "glUsage", void 0);
+    _defineProperty(this, "glIndexType", GL.UNSIGNED_SHORT);
     _defineProperty(this, "byteLength", void 0);
-
     _defineProperty(this, "bytesUsed", void 0);
-
-    _defineProperty(this, "debugData", void 0);
-
-    _defineProperty(this, "webglUsage", void 0);
-
-    _defineProperty(this, "accessor", void 0);
-
+    _defineProperty(this, "debugData", null);
     this.device = device;
     this.gl = this.device.gl;
     this.gl2 = this.device.gl2;
     const handle = typeof props === 'object' ? props.handle : undefined;
     this.handle = handle || this.gl.createBuffer();
-    this.handle.__SPECTOR_Metadata = { ...this.props,
+    device.setSpectorMetadata(this.handle, {
+      ...this.props,
       data: typeof this.props.data
-    };
-    this.target = this.props.target || getWebGLTarget(this.props.usage);
-    this.webglUsage = this.props.webglUsage || getWebGLUsage(this.props.usage);
+    });
+    this.glTarget = getWebGLTarget(this.props.usage);
+    this.glUsage = getWebGLUsage(this.props.usage);
+    this.glIndexType = this.props.indexType === 'uint32' ? GL.UNSIGNED_INT : GL.UNSIGNED_SHORT;
     this.debugData = null;
-
     if (props.data) {
       this._initWithData(props.data, props.byteOffset, props.byteLength);
     } else {
       this._initWithByteLength(props.byteLength || 0);
     }
   }
-
-  _initWithData(data, byteOffset = 0, byteLength = data.byteLength + byteOffset) {
+  _initWithData(data) {
+    let byteOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    let byteLength = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : data.byteLength + byteOffset;
     assert(ArrayBuffer.isView(data));
-
-    const target = this._getWriteTarget();
-
-    this.gl.bindBuffer(target, this.handle);
-    this.gl.bufferData(target, byteLength, this.webglUsage);
-    this.gl.bufferSubData(target, byteOffset, data);
-    this.gl.bindBuffer(target, null);
+    const glTarget = this._getWriteTarget();
+    this.gl.bindBuffer(glTarget, this.handle);
+    this.gl.bufferData(glTarget, byteLength, this.glUsage);
+    this.gl.bufferSubData(glTarget, byteOffset, data);
+    this.gl.bindBuffer(glTarget, null);
     this.debugData = data.slice(0, DEBUG_DATA_LENGTH);
     this.bytesUsed = byteLength;
     this.byteLength = byteLength;
     this.trackAllocatedMemory(byteLength);
     return this;
   }
-
   _initWithByteLength(byteLength) {
     assert(byteLength >= 0);
     let data = byteLength;
-
     if (byteLength === 0) {
       data = new Float32Array(0);
     }
-
-    const target = this._getWriteTarget();
-
-    this.gl.bindBuffer(target, this.handle);
-    this.gl.bufferData(target, data, this.webglUsage);
-    this.gl.bindBuffer(target, null);
+    const glTarget = this._getWriteTarget();
+    this.gl.bindBuffer(glTarget, this.handle);
+    this.gl.bufferData(glTarget, data, this.glUsage);
+    this.gl.bindBuffer(glTarget, null);
     this.debugData = null;
     this.bytesUsed = byteLength;
     this.byteLength = byteLength;
     return this;
   }
-
   destroy() {
-    if (this.handle) {
+    if (!this.destroyed && this.handle) {
       this.removeStats();
       this.trackDeallocatedMemory();
       this.gl.deleteBuffer(this.handle);
+      this.destroyed = true;
       this.handle = null;
     }
   }
-
-  write(data, byteOffset = 0) {
+  write(data) {
+    let byteOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     const srcOffset = 0;
-    const byteLength = data.byteLength;
-    const target = this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.target;
-    this.gl.bindBuffer(target, this.handle);
-
+    const byteLength = undefined;
+    const glTarget = this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.glTarget;
+    this.gl.bindBuffer(glTarget, this.handle);
     if (srcOffset !== 0 || byteLength !== undefined) {
       this.device.assertWebGL2();
-      this.gl.bufferSubData(this.target, offset, data, srcOffset, byteLength);
+      this.gl2.bufferSubData(glTarget, byteOffset, data, srcOffset, byteLength);
     } else {
-      this.gl.bufferSubData(target, byteOffset, data);
+      this.gl.bufferSubData(glTarget, byteOffset, data);
     }
-
-    this.gl.bindBuffer(target, null);
+    this.gl.bindBuffer(glTarget, null);
   }
-
-  async readAsync(byteOffset = 0, byteLength) {
+  async readAsync() {
+    let byteOffset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    let byteLength = arguments.length > 1 ? arguments[1] : undefined;
     this.device.assertWebGL2();
     const data = new Uint8Array(byteLength);
     const dstOffset = 0;
@@ -114,51 +99,38 @@ export default class WEBGLBuffer extends Buffer {
     this.gl.bindBuffer(GL.COPY_READ_BUFFER, null);
     return data;
   }
-
   _invalidateDebugData() {
     this.debugData = null;
   }
-
   _getWriteTarget() {
-    return this.target;
+    return this.glTarget;
   }
-
   _getReadTarget() {
-    return this.target;
-    return this.device.isWebGL2 ? GL.COPY_READ_BUFFER : this.target;
+    return this.glTarget;
   }
-
 }
-
 function getWebGLTarget(usage) {
   if (usage & Buffer.INDEX) {
     return GL.ELEMENT_ARRAY_BUFFER;
   }
-
   if (usage & Buffer.VERTEX) {
     return GL.ARRAY_BUFFER;
   }
-
   if (usage & Buffer.UNIFORM) {
     return GL.UNIFORM_BUFFER;
   }
-
   return GL.ARRAY_BUFFER;
 }
-
 function getWebGLUsage(usage) {
   if (usage & Buffer.INDEX) {
     return GL.STATIC_DRAW;
   }
-
   if (usage & Buffer.VERTEX) {
     return GL.STATIC_DRAW;
   }
-
   if (usage & Buffer.UNIFORM) {
     return GL.DYNAMIC_DRAW;
   }
-
-  return GL.DYNAMIC_DRAW;
+  return GL.STATIC_DRAW;
 }
 //# sourceMappingURL=webgl-buffer.js.map

package/dist/adapter/resources/webgl-buffer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":["Buffer","assert","GL","DEBUG_DATA_LENGTH","WEBGLBuffer","constructor","device","props","gl","gl2","handle","undefined","createBuffer","__SPECTOR_Metadata","data","target","getWebGLTarget","usage","webglUsage","getWebGLUsage","debugData","_initWithData","byteOffset","byteLength","_initWithByteLength","ArrayBuffer","isView","_getWriteTarget","bindBuffer","bufferData","bufferSubData","slice","bytesUsed","trackAllocatedMemory","Float32Array","destroy","removeStats","trackDeallocatedMemory","deleteBuffer","write","srcOffset","isWebGL2","COPY_WRITE_BUFFER","assertWebGL2","offset","readAsync","Uint8Array","dstOffset","COPY_READ_BUFFER","getBufferSubData","_invalidateDebugData","_getReadTarget","INDEX","ELEMENT_ARRAY_BUFFER","VERTEX","ARRAY_BUFFER","UNIFORM","UNIFORM_BUFFER","STATIC_DRAW","DYNAMIC_DRAW"],"mappings":"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","sourcesContent":["import type {BufferProps} from '@luma.gl/api';\nimport {Buffer, assert} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport WebGLDevice from '../webgl-device';\n\nconst DEBUG_DATA_LENGTH = 10;\n\n/** WebGL Buffer interface */\nexport default class WEBGLBuffer extends Buffer {\n  readonly device: WebGLDevice;\n  readonly gl: WebGLRenderingContext;\n  readonly gl2: WebGL2RenderingContext | null;\n  readonly handle: WebGLBuffer;\n  readonly target: number;\n\n  byteLength: number;\n  bytesUsed: number;\n  debugData: ArrayBuffer;\n\n  webglUsage: number;\n\n  accessor: {};\n\n  constructor(device: WebGLDevice, props: BufferProps = {}) {\n    super(device, props);\n\n    this.device = device;\n    this.gl = this.device.gl;\n    this.gl2 = this.device.gl2;\n\n    const handle = typeof props === 'object' ? (props as BufferProps).handle : undefined;\n    this.handle = handle || this.gl.createBuffer();\n    // @ts-expect-error Add metadata for spector\n    this.handle.__SPECTOR_Metadata = {...this.props, data: typeof this.props.data}; // {name: this.props.id};\n\n    // In WebGL1, need to make sure we use GL.ELEMENT_ARRAY_BUFFER when initializing element buffers\n    // otherwise buffer type will lock to generic (non-element) buffer\n    // In WebGL2, we can use GL.COPY_READ_BUFFER which avoids locking the type here\n    // @ts-expect-error Hack - Checking for subclass prop\n    this.target = this.props.target || getWebGLTarget(this.props.usage);\n    // @ts-expect-error Hack - Checking for subclass prop\n    this.webglUsage = this.props.webglUsage || getWebGLUsage(this.props.usage);\n    this.debugData = null;\n\n    // Set data: (re)initializes the buffer\n    if (props.data) {\n      this._initWithData(props.data, props.byteOffset, props.byteLength);\n    } else {\n      this._initWithByteLength(props.byteLength || 0);\n    }\n\n    // Deprecated: Merge main props and accessor\n    // this.accessor = {...props.accessor};\n\n    // Object.seal(this);\n  }\n\n   // PRIVATE METHODS\n\n  // Allocate a new buffer and initialize to contents of typed array\n  _initWithData(data, byteOffset: number = 0, byteLength: number = data.byteLength + byteOffset): this {\n    assert(ArrayBuffer.isView(data));\n\n    const target = this._getWriteTarget();\n\n    this.gl.bindBuffer(target, this.handle);\n    this.gl.bufferData(target, byteLength, this.webglUsage);\n    this.gl.bufferSubData(target, byteOffset, data);\n    this.gl.bindBuffer(target, null);\n\n    this.debugData = data.slice(0, DEBUG_DATA_LENGTH);\n    this.bytesUsed = byteLength;\n    this.byteLength = byteLength;\n    this.trackAllocatedMemory(byteLength);\n\n    return this;\n  }\n\n  // Allocate a GPU buffer of specified size.\n  _initWithByteLength(byteLength: number): this {\n    assert(byteLength >= 0);\n\n    // Workaround needed for Safari (#291):\n    // gl.bufferData with size equal to 0 crashes. Instead create zero sized array.\n    let data = byteLength;\n    if (byteLength === 0) {\n      // @ts-expect-error\n      data = new Float32Array(0);\n    }\n\n    const target = this._getWriteTarget();\n\n    this.gl.bindBuffer(target, this.handle);\n    this.gl.bufferData(target, data, this.webglUsage);\n    this.gl.bindBuffer(target, null);\n\n    this.debugData = null;\n    this.bytesUsed = byteLength;\n    this.byteLength = byteLength;\n\n    return this;\n  }\n\n  destroy(): void {\n    if (this.handle) {\n      this.removeStats();\n      this.trackDeallocatedMemory();\n      this.gl.deleteBuffer(this.handle);\n      // @ts-expect-error\n      this.handle = null;\n    }\n  }\n\n  write(data: ArrayBufferView, byteOffset: number = 0): void {\n    const srcOffset = 0;\n    const byteLength = data.byteLength;\n\n    // Create the buffer - binding it here for the first time locks the type\n    // In WebGL2, use GL.COPY_WRITE_BUFFER to avoid locking the type\n    const target = this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.target;\n    this.gl.bindBuffer(target, this.handle);\n    // WebGL2: subData supports additional srcOffset and length parameters\n    if (srcOffset !== 0 || byteLength !== undefined) {\n      this.device.assertWebGL2();\n\n      // @ts-expect-error\n      this.gl.bufferSubData(this.target, offset, data, srcOffset, byteLength);\n    } else {\n      this.gl.bufferSubData(target, byteOffset, data);\n    }\n    this.gl.bindBuffer(target, null);\n\n    // TODO - update local `data` if offsets are right\n    // this.debugData = data.slice(byteOffset, 40);\n  }\n\n  /** Read data from the buffer */\n  async readAsync(\n    byteOffset: number = 0,\n    byteLength?: number\n  ): Promise<ArrayBuffer> {\n    this.device.assertWebGL2();\n\n    const data = new Uint8Array(byteLength);\n    const dstOffset = 0;\n\n    // Use GL.COPY_READ_BUFFER to avoid disturbing other targets and locking type\n    this.gl.bindBuffer(GL.COPY_READ_BUFFER, this.handle);\n    this.gl2.getBufferSubData(GL.COPY_READ_BUFFER, byteOffset, data, dstOffset, byteLength);\n    this.gl.bindBuffer(GL.COPY_READ_BUFFER, null);\n\n    // TODO - update local `data` if offsets are 0\n    // this.debugData = null;\n\n    return data;\n  }\n\n  // PROTECTED METHODS (INTENDED FOR USE BY OTHER FRAMEWORK CODE ONLY)\n\n  _invalidateDebugData() {\n    this.debugData = null;\n  }\n\n  _getWriteTarget() {\n    return this.target;\n    // return this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.target;\n  }\n\n  _getReadTarget() {\n    return this.target;\n    return this.device.isWebGL2 ? GL.COPY_READ_BUFFER : this.target;\n  }\n}\n\n// static MAP_READ = 0x01;\n// static MAP_WRITE = 0x02;\n// static COPY_SRC = 0x0004;\n// static COPY_DST = 0x0008;\n// static INDEX = 0x0010;\n// static VERTEX = 0x0020;\n// static UNIFORM = 0x0040;\n// static STORAGE = 0x0080;\n// static INDIRECT = 0x0100;\n// static QUERY_RESOLVE = 0x0200;\n\nfunction getWebGLTarget(usage: number): GL {\n  if (usage & Buffer.INDEX) {\n    return GL.ELEMENT_ARRAY_BUFFER;\n  }\n  if (usage & Buffer.VERTEX) {\n    return GL.ARRAY_BUFFER;\n  }\n  if (usage & Buffer.UNIFORM) {\n    return GL.UNIFORM_BUFFER;\n  }\n\n  // gl.COPY_READ_BUFFER: Buffer for copying from one buffer object to another.\n  // gl.COPY_WRITE_BUFFER: Buffer for copying from one buffer object to another.\n  // gl.TRANSFORM_FEEDBACK_BUFFER: Buffer for transform feedback operations.\n  // gl.PIXEL_PACK_BUFFER: Buffer used for pixel transfer operations.\n  // gl.PIXEL_UNPACK_BUFFER: Buffer used for pixel transfer operations.\n\n  // Binding a buffer for the first time locks the type\n  // In WebGL2, use GL.COPY_WRITE_BUFFER to avoid locking the type\n  return GL.ARRAY_BUFFER;\n}\n\nfunction getWebGLUsage(usage: number): GL {\n  if (usage & Buffer.INDEX) {\n    return GL.STATIC_DRAW;\n  }\n  if (usage & Buffer.VERTEX) {\n    return GL.STATIC_DRAW;\n  }\n  if (usage & Buffer.UNIFORM) {\n    return GL.DYNAMIC_DRAW;\n  }\n  return GL.DYNAMIC_DRAW;\n}\n"],"file":"webgl-buffer.js"}
+{"version":3,"file":"webgl-buffer.js","names":["Buffer","assert","GL","DEBUG_DATA_LENGTH","WEBGLBuffer","constructor","device","props","arguments","length","undefined","_defineProperty","UNSIGNED_SHORT","gl","gl2","handle","createBuffer","setSpectorMetadata","data","glTarget","getWebGLTarget","usage","glUsage","getWebGLUsage","glIndexType","indexType","UNSIGNED_INT","debugData","_initWithData","byteOffset","byteLength","_initWithByteLength","ArrayBuffer","isView","_getWriteTarget","bindBuffer","bufferData","bufferSubData","slice","bytesUsed","trackAllocatedMemory","Float32Array","destroy","destroyed","removeStats","trackDeallocatedMemory","deleteBuffer","write","srcOffset","isWebGL2","COPY_WRITE_BUFFER","assertWebGL2","readAsync","Uint8Array","dstOffset","COPY_READ_BUFFER","getBufferSubData","_invalidateDebugData","_getReadTarget","INDEX","ELEMENT_ARRAY_BUFFER","VERTEX","ARRAY_BUFFER","UNIFORM","UNIFORM_BUFFER","STATIC_DRAW","DYNAMIC_DRAW"],"sources":["../../../src/adapter/resources/webgl-buffer.ts"],"sourcesContent":["import type {BufferProps} from '@luma.gl/core';\nimport {Buffer, assert} from '@luma.gl/core';\nimport {GL} from '@luma.gl/constants';\nimport {WebGLDevice} from '../webgl-device';\n\nconst DEBUG_DATA_LENGTH = 10;\n\n/** WebGL Buffer interface */\nexport class WEBGLBuffer extends Buffer {\n  readonly device: WebGLDevice;\n  readonly gl: WebGLRenderingContext;\n  readonly gl2: WebGL2RenderingContext | null;\n  readonly handle: WebGLBuffer;\n\n  /** Target in OpenGL defines the type of buffer */\n  readonly glTarget: GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.UNIFORM_BUFFER;\n  /** Usage is a hint on how frequently the buffer will be updates */\n  readonly glUsage: GL.STATIC_DRAW | GL.DYNAMIC_DRAW;\n  /** Index type is needed when issuing draw calls, so we pre-compute it */\n  readonly glIndexType: GL.UNSIGNED_SHORT | GL.UNSIGNED_INT = GL.UNSIGNED_SHORT;\n\n  /** Number of bytes allocated on the GPU for this buffer */\n  byteLength: number;\n  /** Number of bytes used */\n  bytesUsed: number;\n  /** A partial CPU-side copy of the data in this buffer, for debugging purposes */\n  debugData: ArrayBuffer | null = null;\n\n  constructor(device: WebGLDevice, props: BufferProps = {}) {\n    super(device, props);\n\n    this.device = device;\n    this.gl = this.device.gl;\n    this.gl2 = this.device.gl2;\n\n    const handle = typeof props === 'object' ? (props ).handle : undefined;\n    this.handle = handle || this.gl.createBuffer();\n    device.setSpectorMetadata(this.handle, {...this.props, data: typeof this.props.data});\n\n    // - In WebGL1, need to make sure we use GL.ELEMENT_ARRAY_BUFFER when initializing element buffers\n    //   otherwise buffer type will lock to generic (non-element) buffer\n    // - In WebGL2, we can use GL.COPY_READ_BUFFER which avoids locking the type here\n    this.glTarget = getWebGLTarget(this.props.usage);\n    this.glUsage = getWebGLUsage(this.props.usage);\n    this.glIndexType = this.props.indexType === 'uint32' ? GL.UNSIGNED_INT :  GL.UNSIGNED_SHORT;\n\n    this.debugData = null;\n\n    // Set data: (re)initializes the buffer\n    if (props.data) {\n      this._initWithData(props.data, props.byteOffset, props.byteLength);\n    } else {\n      this._initWithByteLength(props.byteLength || 0);\n    }\n  }\n\n  // PRIVATE METHODS\n\n  /** Allocate a new buffer and initialize to contents of typed array */\n  _initWithData(data, byteOffset: number = 0, byteLength: number = data.byteLength + byteOffset): this {\n    assert(ArrayBuffer.isView(data));\n\n    const glTarget = this._getWriteTarget();\n    this.gl.bindBuffer(glTarget, this.handle);\n    this.gl.bufferData(glTarget, byteLength, this.glUsage);\n    this.gl.bufferSubData(glTarget, byteOffset, data);\n    this.gl.bindBuffer(glTarget, null);\n\n    this.debugData = data.slice(0, DEBUG_DATA_LENGTH);\n    this.bytesUsed = byteLength;\n    this.byteLength = byteLength;\n    this.trackAllocatedMemory(byteLength);\n\n    return this;\n  }\n\n  // Allocate a GPU buffer of specified size.\n  _initWithByteLength(byteLength: number): this {\n    assert(byteLength >= 0);\n\n    // Workaround needed for Safari (#291):\n    // gl.bufferData with size equal to 0 crashes. Instead create zero sized array.\n    let data = byteLength;\n    if (byteLength === 0) {\n      // @ts-expect-error\n      data = new Float32Array(0);\n    }\n\n    const glTarget = this._getWriteTarget();\n\n    this.gl.bindBuffer(glTarget, this.handle);\n    this.gl.bufferData(glTarget, data, this.glUsage);\n    this.gl.bindBuffer(glTarget, null);\n\n    this.debugData = null;\n    this.bytesUsed = byteLength;\n    this.byteLength = byteLength;\n\n    return this;\n  }\n\n  override destroy(): void {\n    if (!this.destroyed && this.handle) {\n      this.removeStats();\n      this.trackDeallocatedMemory();\n      this.gl.deleteBuffer(this.handle);\n      this.destroyed = true;\n      // @ts-expect-error\n      this.handle = null;\n    }\n  }\n\n  override write(data: ArrayBufferView, byteOffset: number = 0): void {\n    const srcOffset = 0;\n    const byteLength = undefined; // data.byteLength;\n\n    // Create the buffer - binding it here for the first time locks the type\n    // In WebGL2, use GL.COPY_WRITE_BUFFER to avoid locking the type\n    const glTarget = this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.glTarget;\n    this.gl.bindBuffer(glTarget, this.handle);\n    // WebGL2: subData supports additional srcOffset and length parameters\n    if (srcOffset !== 0 || byteLength !== undefined) {\n      this.device.assertWebGL2();\n      this.gl2.bufferSubData(glTarget, byteOffset, data, srcOffset, byteLength);\n    } else {\n      this.gl.bufferSubData(glTarget, byteOffset, data);\n    }\n    this.gl.bindBuffer(glTarget, null);\n\n    // TODO - update local `data` if offsets are right\n    // this.debugData = data.slice(byteOffset, 40);\n  }\n\n  /** Read data from the buffer */\n  override async readAsync(\n    byteOffset: number = 0,\n    byteLength?: number\n  ): Promise<ArrayBuffer> {\n    this.device.assertWebGL2();\n\n    const data = new Uint8Array(byteLength);\n    const dstOffset = 0;\n\n    // Use GL.COPY_READ_BUFFER to avoid disturbing other targets and locking type\n    this.gl.bindBuffer(GL.COPY_READ_BUFFER, this.handle);\n    this.gl2.getBufferSubData(GL.COPY_READ_BUFFER, byteOffset, data, dstOffset, byteLength);\n    this.gl.bindBuffer(GL.COPY_READ_BUFFER, null);\n\n    // TODO - update local `data` if offsets are 0\n    // this.debugData = null;\n\n    return data;\n  }\n\n  // PROTECTED METHODS (INTENDED FOR USE BY OTHER FRAMEWORK CODE ONLY)\n\n  _invalidateDebugData() {\n    this.debugData = null;\n  }\n\n  _getWriteTarget() {\n    return this.glTarget;\n    // return this.device.isWebGL2 ? GL.COPY_WRITE_BUFFER : this.glTarget;\n  }\n\n  _getReadTarget() {\n    return this.glTarget;\n    // return this.device.isWebGL2 ? GL.COPY_READ_BUFFER : this.glTarget;\n  }\n}\n\n// static MAP_READ = 0x01;\n// static MAP_WRITE = 0x02;\n// static COPY_SRC = 0x0004;\n// static COPY_DST = 0x0008;\n// static INDEX = 0x0010;\n// static VERTEX = 0x0020;\n// static UNIFORM = 0x0040;\n// static STORAGE = 0x0080;\n// static INDIRECT = 0x0100;\n// static QUERY_RESOLVE = 0x0200;\n\nfunction getWebGLTarget(usage: number): GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.UNIFORM_BUFFER {\n  if (usage & Buffer.INDEX) {\n    return GL.ELEMENT_ARRAY_BUFFER;\n  }\n  if (usage & Buffer.VERTEX) {\n    return GL.ARRAY_BUFFER;\n  }\n  if (usage & Buffer.UNIFORM) {\n    return GL.UNIFORM_BUFFER;\n  }\n\n  // gl.COPY_READ_BUFFER: Buffer for copying from one buffer object to another.\n  // gl.COPY_WRITE_BUFFER: Buffer for copying from one buffer object to another.\n  // gl.TRANSFORM_FEEDBACK_BUFFER: Buffer for transform feedback operations.\n  // gl.PIXEL_PACK_BUFFER: Buffer used for pixel transfer operations.\n  // gl.PIXEL_UNPACK_BUFFER: Buffer used for pixel transfer operations.\n\n  // Binding a buffer for the first time locks the type\n  // In WebGL2, use GL.COPY_WRITE_BUFFER to avoid locking the type\n  return GL.ARRAY_BUFFER;\n}\n\n/** @todo usage is not passed correctly */\nfunction getWebGLUsage(usage: number): GL.STATIC_DRAW | GL.DYNAMIC_DRAW {\n  if (usage & Buffer.INDEX) {\n    return GL.STATIC_DRAW;\n  }\n  if (usage & Buffer.VERTEX) {\n    return GL.STATIC_DRAW;\n  }\n  if (usage & Buffer.UNIFORM) {\n    return GL.DYNAMIC_DRAW;\n  }\n  return GL.STATIC_DRAW;\n}\n"],"mappings":"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"}

package/dist/adapter/resources/webgl-command-buffer.d.ts

@@ -1,25 +1,31 @@
-import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/api';
-import WebGLDevice from '../webgl-device';
-declare type CopyBufferToBufferCommand = {
+import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
+import { CommandBuffer } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { WebGLDevice } from '../webgl-device';
+type CopyBufferToBufferCommand = {
     name: 'copy-buffer-to-buffer';
     options: CopyBufferToBufferOptions;
 };
-declare type CopyBufferToTextureCommand = {
+type CopyBufferToTextureCommand = {
     name: 'copy-buffer-to-texture';
     options: CopyBufferToTextureOptions;
 };
-declare type CopyTextureToBufferCommand = {
+type CopyTextureToBufferCommand = {
     name: 'copy-texture-to-buffer';
     options: CopyTextureToBufferOptions;
 };
-declare type CopyTextureToTextureCommand = {
+type CopyTextureToTextureCommand = {
     name: 'copy-texture-to-texture';
     options: CopyTextureToTextureOptions;
 };
-declare type Command = CopyBufferToBufferCommand | CopyBufferToTextureCommand | CopyTextureToBufferCommand | CopyTextureToTextureCommand;
-export default class CommandBuffer {
+type Command = CopyBufferToBufferCommand | CopyBufferToTextureCommand | CopyTextureToBufferCommand | CopyTextureToTextureCommand;
+export declare class WEBGLCommandBuffer extends CommandBuffer {
+    device: WebGLDevice;
     commands: Command[];
+    constructor(device: WebGLDevice);
+    submitCommands(commands?: Command[]): void;
 }
-export declare function submitCommands(device: WebGLDevice, commands?: Command[]): void;
+export declare function glFormatToComponents(format: any): 1 | 2 | 3 | 4;
+export declare function glTypeToBytes(type: GL): 1 | 2 | 4;
 export {};
 //# sourceMappingURL=webgl-command-buffer.d.ts.map

package/dist/adapter/resources/webgl-command-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAEtB,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAO1C,aAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,yBAAyB,CAAC;CACpC,CAAC;AAEF,aAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,aAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,aAAK,2BAA2B,GAAG;IACjC,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,2BAA2B,CAAC;CACtC,CAAC;AAEF,aAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,QAAQ,EAAE,OAAO,EAAE,CAAM;CAC1B;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,GAAE,OAAO,EAAO,QAiB3E"}
+{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,aAAa,EAId,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAS5C,KAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,yBAAyB,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,2BAA2B,CAAC;CACtC,CAAC;AAEF,KAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,CAAC;AAEhC,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAM;gBAEb,MAAM,EAAE,WAAW;IAK/B,cAAc,CAAC,QAAQ,GAAE,OAAO,EAAkB;CAkBnD;AAyQD,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAmB1D;AAGD,wBAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAcjD"}