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

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"}

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

@@ -1,52 +1,43 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import GL from '@luma.gl/constants';
-
+import { CommandBuffer, Texture } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { WEBGLTexture } from "./webgl-texture.js";
 function cast(value) {
   return value;
 }
-
-export default class CommandBuffer {
-  constructor() {
+export class WEBGLCommandBuffer extends CommandBuffer {
+  constructor(device) {
+    super({});
+    _defineProperty(this, "device", void 0);
     _defineProperty(this, "commands", []);
+    this.device = device;
   }
-
-}
-export function submitCommands(device, commands = []) {
-  for (const command of commands) {
-    switch (command.name) {
-      case 'copy-buffer-to-buffer':
-        _copyBufferToBuffer(device, command.options);
-
-        break;
-
-      case 'copy-buffer-to-texture':
-        _copyBufferToTexture(device, command.options);
-
-        break;
-
-      case 'copy-texture-to-buffer':
-        _copyTextureToBuffer(device, command.options);
-
-        break;
-
-      case 'copy-texture-to-texture':
-        _copyTextureToTexture(device, command.options);
-
-        break;
+  submitCommands() {
+    let commands = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.commands;
+    for (const command of commands) {
+      switch (command.name) {
+        case 'copy-buffer-to-buffer':
+          _copyBufferToBuffer(this.device, command.options);
+          break;
+        case 'copy-buffer-to-texture':
+          _copyBufferToTexture(this.device, command.options);
+          break;
+        case 'copy-texture-to-buffer':
+          _copyTextureToBuffer(this.device, command.options);
+          break;
+        case 'copy-texture-to-texture':
+          _copyTextureToTexture(this.device, command.options);
+          break;
+      }
     }
   }
 }
-
 function _copyBufferToBuffer(device, options) {
   const source = cast(options.source);
   const destination = cast(options.destination);
-  const {
-    gl2
-  } = device;
-
+  const gl2 = device.assertWebGL2();
   if (gl2) {
     var _options$sourceOffset, _options$destinationO;
-
     gl2.bindBuffer(GL.COPY_READ_BUFFER, source.handle);
     gl2.bindBuffer(GL.COPY_WRITE_BUFFER, destination.handle);
     gl2.copyBufferSubData(GL.COPY_READ_BUFFER, GL.COPY_WRITE_BUFFER, (_options$sourceOffset = options.sourceOffset) !== null && _options$sourceOffset !== void 0 ? _options$sourceOffset : 0, (_options$destinationO = options.destinationOffset) !== null && _options$destinationO !== void 0 ? _options$destinationO : 0, options.size);
@@ -56,10 +47,147 @@ function _copyBufferToBuffer(device, options) {
     throw new Error('copyBufferToBuffer not implemented in WebGL1');
   }
 }
-
-function _copyBufferToTexture(device, options) {}
-
-function _copyTextureToBuffer(device, options) {}
-
-function _copyTextureToTexture(device, options) {}
+function _copyBufferToTexture(device, options) {
+  throw new Error('Not implemented');
+}
+function _copyTextureToBuffer(device, options) {
+  const {
+    source,
+    mipLevel = 0,
+    aspect = 'all',
+    width = options.source.width,
+    height = options.source.height,
+    depthOrArrayLayers = 0,
+    origin = [0, 0],
+    destination,
+    byteOffset = 0,
+    bytesPerRow,
+    rowsPerImage
+  } = options;
+  if (aspect !== 'all') {
+    throw new Error('not supported');
+  }
+  if (mipLevel !== 0 || depthOrArrayLayers !== undefined || bytesPerRow || rowsPerImage) {
+    throw new Error('not implemented');
+  }
+  const gl2 = device.assertWebGL2();
+  const {
+    framebuffer,
+    destroyFramebuffer
+  } = getFramebuffer(source);
+  try {
+    const webglBuffer = destination;
+    const sourceWidth = width || framebuffer.width;
+    const sourceHeight = height || framebuffer.height;
+    const sourceFormat = GL.RGBA;
+    const sourceType = GL.UNSIGNED_BYTE;
+    gl2.bindBuffer(GL.PIXEL_PACK_BUFFER, webglBuffer.handle);
+    gl2.bindFramebuffer(GL.FRAMEBUFFER, framebuffer.handle);
+    gl2.readPixels(origin[0], origin[1], sourceWidth, sourceHeight, sourceFormat, sourceType, byteOffset);
+  } finally {
+    gl2.bindBuffer(GL.PIXEL_PACK_BUFFER, null);
+    gl2.bindFramebuffer(GL.FRAMEBUFFER, null);
+    if (destroyFramebuffer) {
+      framebuffer.destroy();
+    }
+  }
+}
+function _copyTextureToTexture(device, options) {
+  const {
+    source,
+    origin = [0, 0],
+    destination
+  } = options;
+  let {
+    width = options.destination.width,
+    height = options.destination.width
+  } = options;
+  const destinationMipmaplevel = 0;
+  const destinationInternalFormat = GL.RGBA;
+  const {
+    framebuffer,
+    destroyFramebuffer
+  } = getFramebuffer(source);
+  const [sourceX, sourceY] = origin;
+  const isSubCopy = false;
+  device.gl.bindFramebuffer(GL.FRAMEBUFFER, framebuffer.handle);
+  let texture = null;
+  let textureTarget;
+  if (destination instanceof WEBGLTexture) {
+    texture = destination;
+    width = Number.isFinite(width) ? width : texture.width;
+    height = Number.isFinite(height) ? height : texture.height;
+    texture.bind(0);
+    textureTarget = texture.destination;
+  } else {
+    throw new Error('whoops');
+  }
+  if (!isSubCopy) {
+    device.gl.copyTexImage2D(textureTarget, destinationMipmaplevel, destinationInternalFormat, sourceX, sourceY, width, height, 0);
+  } else {}
+  if (texture) {
+    texture.unbind();
+  }
+  device.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle || null);
+  if (destroyFramebuffer) {
+    framebuffer.destroy();
+  }
+  return texture;
+}
+export function glFormatToComponents(format) {
+  switch (format) {
+    case GL.ALPHA:
+    case GL.R32F:
+    case GL.RED:
+      return 1;
+    case GL.RG32F:
+    case GL.RG:
+      return 2;
+    case GL.RGB:
+    case GL.RGB32F:
+      return 3;
+    case GL.RGBA:
+    case GL.RGBA32F:
+      return 4;
+    default:
+      throw new Error('GLFormat');
+  }
+}
+export function glTypeToBytes(type) {
+  switch (type) {
+    case GL.UNSIGNED_BYTE:
+      return 1;
+    case GL.UNSIGNED_SHORT_5_6_5:
+    case GL.UNSIGNED_SHORT_4_4_4_4:
+    case GL.UNSIGNED_SHORT_5_5_5_1:
+      return 2;
+    case GL.FLOAT:
+      return 4;
+    default:
+      throw new Error('GLType');
+  }
+}
+function getFramebuffer(source) {
+  if (source instanceof Texture) {
+    const {
+      width,
+      height,
+      id
+    } = source;
+    const framebuffer = source.device.createFramebuffer({
+      id: "framebuffer-for-".concat(id),
+      width,
+      height,
+      colorAttachments: [source]
+    });
+    return {
+      framebuffer,
+      destroyFramebuffer: true
+    };
+  }
+  return {
+    framebuffer: source,
+    destroyFramebuffer: false
+  };
+}
 //# sourceMappingURL=webgl-command-buffer.js.map