@luma.gl/webgl 9.0.11 → 9.1.0-alpha.1

package/dist/adapter/helpers/webgl-texture-utils.js

@@ -0,0 +1,368 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+// import {Buffer} from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+/** A "border" parameter is required in many WebGL texture APIs, but must always be 0... */
+const BORDER = 0;
+/**
+ * Initializes a texture memory space
+ * Clear all the textures and mip levels of a two-dimensional or array texture at the same time.
+ * On some implementations faster than repeatedly setting levels
+ *
+ * @note From WebGL 2 spec section 3.7.6:
+ * @see https://registry.khronos.org/webgl/specs/latest/2.0/
+ * - The image contents are set as if a buffer of sufficient size initialized to 0 would be passed to each level's texImage2D/3D
+ * - texStorage2D should be considered a preferred alternative to texImage2D. It may have lower memory costs than texImage2D in some implementations.
+ * - Once texStorage*D has been called, the texture is immutable and can only be updated with texSubImage*(), not texImage()
+ */
+export function initializeTextureStorage(gl, levels, options) {
+    const { dimension, width, height, depth = 0 } = options;
+    const { glInternalFormat } = options;
+    const glTarget = options.glTarget; // getCubeTargetWebGL(options.glTarget, dimension, depth);
+    switch (dimension) {
+        case '2d-array':
+        case '3d':
+            gl.texStorage3D(glTarget, levels, glInternalFormat, width, height, depth);
+            break;
+        default:
+            gl.texStorage2D(glTarget, levels, glInternalFormat, width, height);
+    }
+}
+/**
+ * Copy a region of compressed data from a GPU memory buffer into this texture.
+ */
+export function copyCPUImageToMipLevel(gl, image, options) {
+    const { dimension, width, height, depth = 0, level = 0 } = options;
+    const { x = 0, y = 0, z = 0 } = options;
+    const { glFormat, glType } = options;
+    const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+    // width = size.width,
+    // height = size.height
+    switch (dimension) {
+        case '2d-array':
+        case '3d':
+            // prettier-ignore
+            gl.texSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, glType, image);
+            break;
+        case '2d':
+        case 'cube':
+            // prettier-ignore
+            gl.texSubImage2D(glTarget, level, x, y, width, height, glFormat, glType, image);
+            break;
+        default:
+            throw new Error(dimension);
+    }
+}
+/**
+ * Copy a region of data from a CPU memory buffer into this texture.
+ */
+export function copyCPUDataToMipLevel(gl, typedArray, options) {
+    const { dimension, width, height, depth = 0, level = 0, byteOffset = 0 } = options;
+    const { x = 0, y = 0, z = 0 } = options;
+    const { glFormat, glType, compressed } = options;
+    const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+    switch (dimension) {
+        case '2d-array':
+        case '3d':
+            if (compressed) {
+                // prettier-ignore
+                gl.compressedTexSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, typedArray, byteOffset); // , byteLength
+            }
+            else {
+                // prettier-ignore
+                gl.texSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, glType, typedArray, byteOffset); // , byteLength
+            }
+            break;
+        case '2d':
+        case 'cube':
+            if (compressed) {
+                // prettier-ignore
+                gl.compressedTexSubImage2D(glTarget, level, x, y, width, height, glFormat, typedArray, byteOffset); // , byteLength
+            }
+            else {
+                // prettier-ignore
+                gl.texSubImage2D(glTarget, level, x, y, width, height, glFormat, glType, typedArray, byteOffset); // , byteLength
+            }
+            break;
+        default:
+            throw new Error(dimension);
+    }
+}
+/**
+ * Copy a region of compressed data from a GPU memory buffer into this texture.
+ */
+export function copyGPUBufferToMipLevel(gl, webglBuffer, byteLength, options) {
+    const { dimension, width, height, depth = 0, level = 0, byteOffset = 0 } = options;
+    const { x = 0, y = 0, z = 0 } = options;
+    const { glFormat, glType, compressed } = options;
+    const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+    gl.bindBuffer(35052, webglBuffer);
+    switch (dimension) {
+        case '2d-array':
+        case '3d':
+            // 3 dimensional textures requires 3D texture functions
+            if (compressed) {
+                // TODO enable extension?
+                // prettier-ignore
+                gl.compressedTexSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, byteLength, byteOffset);
+            }
+            else {
+                // prettier-ignore
+                gl.texSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, glType, byteOffset);
+            }
+            break;
+        case '2d':
+        case 'cube':
+            if (compressed) {
+                // prettier-ignore
+                gl.compressedTexSubImage2D(glTarget, level, x, y, width, height, glFormat, byteLength, byteOffset);
+            }
+            else {
+                // prettier-ignore
+                gl.texSubImage2D(glTarget, level, x, y, width, height, BORDER, glFormat, byteOffset);
+            }
+            break;
+        default:
+            throw new Error(dimension);
+    }
+}
+// INTERNAL HELPERS
+/** Convert a WebGPU style texture constant to a WebGL style texture constant */
+export function getWebGLTextureTarget(dimension) {
+    // prettier-ignore
+    switch (dimension) {
+        case '1d': break; // not supported in any WebGL version
+        case '2d': return 3553; // supported in WebGL1
+        case '3d': return 32879; // supported in WebGL2
+        case 'cube': return 34067; // supported in WebGL1
+        case '2d-array': return 35866; // supported in WebGL2
+        case 'cube-array': break; // not supported in any WebGL version
+    }
+    throw new Error(dimension);
+}
+/**
+ * In WebGL, cube maps specify faces by overriding target instead of using the depth parameter.
+ * @returns glTarget unchanged, if dimension !== 'cube'.
+ */
+function getCubeTargetWebGL(glTarget, dimension, level) {
+    return dimension === 'cube' ? 34069 + level : glTarget;
+}
+// texImage methods
+/**
+ * Clear a texture mip level.
+ * Wrapper for the messy WebGL texture API
+ *
+export function clearMipLevel(gl: WebGL2RenderingContext, options: WebGLSetTextureOptions): void {
+  const {dimension, width, height, depth = 0, level = 0} = options;
+  const {glInternalFormat, glFormat, glType, compressed} = options;
+  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+
+  switch (dimension) {
+    case '2d-array':
+    case '3d':
+      if (compressed) {
+        // prettier-ignore
+        gl.compressedTexImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, null);
+      } else {
+        // prettier-ignore
+        gl.texImage3D( glTarget, level, glInternalFormat, width, height, depth, BORDER, glFormat, glType, null);
+      }
+      break;
+
+    case '2d':
+    case 'cube':
+      if (compressed) {
+        // prettier-ignore
+        gl.compressedTexImage2D(glTarget, level, glInternalFormat, width, height, BORDER, null);
+      } else {
+        // prettier-ignore
+        gl.texImage2D(glTarget, level, glInternalFormat, width, height, BORDER, glFormat, glType, null);
+      }
+      break;
+
+    default:
+      throw new Error(dimension);
+  }
+}
+
+/**
+ * Set a texture mip level to the contents of an external image.
+ * Wrapper for the messy WebGL texture API
+ * @note Corresponds to WebGPU device.queue.copyExternalImageToTexture()
+ *
+export function setMipLevelFromExternalImage(
+  gl: WebGL2RenderingContext,
+  image: ExternalImage,
+  options: WebGLSetTextureOptions
+): void {
+  const {dimension, width, height, depth = 0, level = 0} = options;
+  const {glInternalFormat, glType} = options;
+
+  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+
+  // TODO - we can't change texture width (due to WebGPU limitations) -
+  // and the width/heigh of an external image is implicit, so why do we need to extract it?
+  // So what width height do we supply? The image size or the texture size?
+  // const {width, height} = Texture.getExternalImageSize(image);
+
+  switch (dimension) {
+    case '2d-array':
+    case '3d':
+      // prettier-ignore
+      gl.texImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, glInternalFormat, glType, image);
+      break;
+
+    case '2d':
+    case 'cube':
+      // prettier-ignore
+      gl.texImage2D(glTarget, level, glInternalFormat, width, height, BORDER, glInternalFormat, glType, image);
+      break;
+
+    default:
+      throw new Error(dimension);
+  }
+}
+
+/**
+ * Set a texture mip level from CPU memory
+ * Wrapper for the messy WebGL texture API
+ * @note Not available (directly) in WebGPU
+ *
+export function setMipLevelFromTypedArray(
+  gl: WebGL2RenderingContext,
+  data: TypedArray,
+  parameters: {},
+  options: {
+    dimension: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d';
+    height: number;
+    width: number;
+    depth?: number;
+    level?: number;
+    offset?: number;
+    glTarget: GLTextureTarget;
+    glInternalFormat: GL;
+    glFormat: GL;
+    glType: GL;
+    compressed?: boolean;
+  }
+): void {
+  const {dimension, width, height, depth = 0, level = 0, offset = 0} = options;
+  const {glInternalFormat, glFormat, glType, compressed} = options;
+
+  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+
+  withGLParameters(gl, parameters, () => {
+    switch (dimension) {
+      case '2d-array':
+      case '3d':
+        if (compressed) {
+          // prettier-ignore
+          gl.compressedTexImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, data);
+        } else {
+          // prettier-ignore
+          gl.texImage3D( glTarget, level, glInternalFormat, width, height, depth, BORDER, glFormat, glType, data);
+        }
+        break;
+
+      case '2d':
+        if (compressed) {
+          // prettier-ignore
+          gl.compressedTexImage2D(glTarget, level, glInternalFormat, width, height, BORDER, data);
+        } else {
+          // prettier-ignore
+          gl.texImage2D( glTarget, level, glInternalFormat, width, height, BORDER, glFormat, glType, data, offset);
+        }
+        break;
+
+      default:
+        throw new Error(dimension);
+    }
+  });
+}
+
+/**
+   * Set a texture level from CPU memory
+   * @note Not available (directly) in WebGPU
+  _setMipLevelFromTypedArray(
+    depth: number,
+    level: number,
+    data: TextureLevelData,
+    offset = 0,
+    parameters
+  ): void {
+    withGLParameters(this.gl, parameters, () => {
+      switch (this.props.dimension) {
+        case '2d-array':
+        case '3d':
+          if (this.compressed) {
+            // prettier-ignore
+            this.device.gl.compressedTexImage3D(this.glTarget, level, this.glInternalFormat, data.width, data.height, depth, BORDER, data.data);
+          } else {
+            // prettier-ignore
+            this.gl.texImage3D( this.glTarget, level, this.glInternalFormat, this.width, this.height, depth, BORDER, this.glFormat, this.glType, data.data);
+          }
+          break;
+
+        case '2d':
+          if (this.compressed) {
+            // prettier-ignore
+            this.device.gl.compressedTexImage2D(this.glTarget, level, this.glInternalFormat, data.width, data.height, BORDER, data.data);
+          } else {
+            // prettier-ignore
+            this.device.gl.texImage2D( this.glTarget, level, this.glInternalFormat, this.width, this.height, BORDER, this.glFormat, this.glType, data.data, offset);
+          }
+          break;
+
+        default:
+          throw new Error(this.props.dimension);
+      }
+    });
+  }
+
+ * Set a texture level from a GPU buffer
+ *
+export function setMipLevelFromGPUBuffer(
+  gl: WebGL2RenderingContext,
+  buffer: Buffer,
+  options: WebGLSetTextureOptions
+): void {
+  const {dimension, width, height, depth = 0, level = 0, byteOffset = 0} = options;
+  const {glInternalFormat, glFormat, glType, compressed} = options;
+  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+
+  const webglBuffer = buffer as WEBGLBuffer;
+  const imageSize = buffer.byteLength;
+
+  // In WebGL the source buffer is not a parameter. Instead it needs to be bound to a special bind point
+  gl.bindBuffer(GL.PIXEL_UNPACK_BUFFER, webglBuffer.handle);
+
+  switch (dimension) {
+    case '2d-array':
+    case '3d':
+      if (compressed) {
+        // prettier-ignore
+        gl.compressedTexImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, imageSize, byteOffset);
+      } else {
+        // prettier-ignore
+        gl.texImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, glFormat, glType, byteOffset);
+      }
+      break;
+
+    case '2d':
+      if (compressed) {
+        // prettier-ignore
+        gl.compressedTexImage2D(glTarget, level, glInternalFormat, width, height, BORDER, imageSize, byteOffset);
+      } else {
+        // prettier-ignore
+        gl.texImage2D(glTarget, level, glInternalFormat, width, height, BORDER, glFormat, glType, byteOffset);
+      }
+      break;
+
+    default:
+      throw new Error(dimension);
+  }
+
+  gl.bindBuffer(GL.PIXEL_UNPACK_BUFFER, null);
+}
+*/

package/dist/adapter/helpers/webgl-topology-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-topology-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGhD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,WAAW,CAmB/E;AAGD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAkBT;AAGD,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAaT;AAED,sCAAsC;AACtC,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,iBAAiB,GAEzB,EAAE,CAAC,MAAM,GACT,EAAE,CAAC,KAAK,GACR,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,cAAc,GACjB,EAAE,CAAC,YAAY,CAYlB;AAED,oDAAoD;AACpD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAY/F"}
+{"version":3,"file":"webgl-topology-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGhD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,WAAW,CAmB/E;AAGD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAkBT;AAGD,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAaT;AAED,sCAAsC;AACtC,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,iBAAiB,GAEzB,EAAE,CAAC,MAAM,GACT,EAAE,CAAC,KAAK,GACR,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,cAAc,GACjB,EAAE,CAAC,YAAY,CAUlB;AAED,oDAAoD;AACpD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAU/F"}

package/dist/adapter/helpers/webgl-topology-utils.js

@@ -65,10 +65,8 @@ export function getGLDrawMode(topology) {
         case 'point-list': return 0;
         case 'line-list': return 1;
         case 'line-strip': return 3;
-        case 'line-loop-webgl': return 2;
         case 'triangle-list': return 4;
         case 'triangle-strip': return 5;
-        case 'triangle-fan-webgl': return 6;
         default: throw new Error(topology);
     }
 }
@@ -79,10 +77,8 @@ export function getGLPrimitive(topology) {
         case 'point-list': return 0;
         case 'line-list': return 1;
         case 'line-strip': return 1;
-        case 'line-loop-webgl': return 1;
         case 'triangle-list': return 4;
         case 'triangle-strip': return 4;
-        case 'triangle-fan-webgl': return 4;
         default: throw new Error(topology);
     }
 }

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":"AAIA,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,2BAAwB;AAE5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,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;gBAEN,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA2BxD,sEAAsE;IACtE,aAAa,CACX,IAAI,EAAE,WAAW,GAAG,eAAe,EACnC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,IAAI;IAgBP,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA2BpC,OAAO,IAAI,IAAI;IAWf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAmBnE,+CAA+C;IAChC,SAAS,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlF,2DAA2D;IAClD,aAAa,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU;CAexE"}
+{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,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;gBAEN,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA2BxD,sEAAsE;IACtE,aAAa,CACX,IAAI,EAAE,WAAW,GAAG,eAAe,EACnC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,IAAI;IAgBP,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA2BpC,OAAO,IAAI,IAAI;IAWf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAmBnE,+CAA+C;IAChC,SAAS,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlF,2DAA2D;IAClD,aAAa,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU;CAexE"}

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

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Buffer, assert } from '@luma.gl/core';
+import { Buffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 /** WebGL Buffer interface */
 export class WEBGLBuffer extends Buffer {
@@ -55,7 +55,7 @@ export class WEBGLBuffer extends Buffer {
     }
     // Allocate a GPU buffer of specified size.
     _initWithByteLength(byteLength) {
-        assert(byteLength >= 0);
+        // assert(byteLength >= 0);
         // Workaround needed for Safari (#291):
         // gl.bufferData with size equal to 0 crashes. Instead create zero sized array.
         let data = byteLength;

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":"AAIA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,aAAa,EAAuB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAU5C,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;AAgPD,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"}
+{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,aAAa,EAAuB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAM5C,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;AAkPD,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

@@ -4,10 +4,7 @@
 import { CommandBuffer, Texture } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { WEBGLTexture } from "./webgl-texture.js";
-import { getWebGLTextureParameters } from "../converters/texture-formats.js";
-function cast(value) {
-    return value;
-}
+import { getTextureFormatWebGL } from "../converters/texture-formats.js";
 export class WEBGLCommandBuffer extends CommandBuffer {
     device;
     commands = [];
@@ -35,8 +32,8 @@ export class WEBGLCommandBuffer extends CommandBuffer {
     }
 }
 function _copyBufferToBuffer(device, options) {
-    const source = cast(options.source);
-    const destination = cast(options.destination);
+    const source = options.source;
+    const destination = options.destination;
     // {In WebGL2 we can p}erform the copy on the GPU
     // Use GL.COPY_READ_BUFFER+GL.COPY_WRITE_BUFFER avoid disturbing other targets and locking type
     device.gl.bindBuffer(36662, source.handle);
@@ -100,8 +97,8 @@ function _copyTextureToBuffer(device, options) {
         const webglBuffer = destination;
         const sourceWidth = width || framebuffer.width;
         const sourceHeight = height || framebuffer.height;
-        const sourceParams = getWebGLTextureParameters(framebuffer.texture.props.format);
-        const sourceFormat = sourceParams.dataFormat;
+        const sourceParams = getTextureFormatWebGL(framebuffer.colorAttachments[0].texture.props.format);
+        const sourceFormat = sourceParams.format;
         const sourceType = sourceParams.type;
         // if (!target) {
         //   // Create new buffer with enough size
@@ -186,7 +183,7 @@ function _copyTextureToTexture(device, options) {
         width = Number.isFinite(width) ? width : texture.width;
         height = Number.isFinite(height) ? height : texture.height;
         texture.bind(0);
-        textureTarget = texture.target;
+        textureTarget = texture.glTarget;
     }
     else {
         throw new Error('invalid destination');

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

@@ -10,7 +10,8 @@ export declare class WEBGLFramebuffer extends Framebuffer {
     device: WebGLDevice;
     gl: WebGL2RenderingContext;
     handle: WebGLFramebuffer;
-    get texture(): import("@luma.gl/core").TextureView;
+    colorAttachments: WEBGLTextureView[];
+    depthStencilAttachment: WEBGLTextureView | null;
     constructor(device: WebGLDevice, props: FramebufferProps);
     /** destroys any auto created resources etc. */
     destroy(): void;
@@ -18,16 +19,42 @@ export declare class WEBGLFramebuffer extends Framebuffer {
     protected createDepthStencilTexture(format: TextureFormat): Texture;
     /**
      * Attachment resize is expected to be a noop if size is same
-     */
-    protected resizeAttachments(width: number, height: number): this;
+     *
+    protected override resizeAttachments(width: number, height: number): this {
+      // for default framebuffer, just update the stored size
+      if (this.handle === null) {
+        // assert(width === undefined && height === undefined);
+        this.width = this.gl.drawingBufferWidth;
+        this.height = this.gl.drawingBufferHeight;
+        return this;
+      }
+  
+      if (width === undefined) {
+        width = this.gl.drawingBufferWidth;
+      }
+      if (height === undefined) {
+        height = this.gl.drawingBufferHeight;
+      }
+  
+      // TODO Not clear that this is better than default destroy/create implementation
+  
+      for (const colorAttachment of this.colorAttachments) {
+        colorAttachment.texture.clone({width, height});
+      }
+      if (this.depthStencilAttachment) {
+        this.depthStencilAttachment.texture.resize({width, height});
+      }
+      return this;
+    }
+    */
     /** Attach one attachment */
-    protected _attachOne(attachmentPoint: GL, attachment: Attachment): WEBGLTexture;
+    protected _attachTexture(attachmentPoint: GL, textureView: WEBGLTextureView): void;
     /**
      * @param attachment
      * @param texture
      * @param layer = 0 - index into WEBGLTextureArray and Texture3D or face for `TextureCubeMap`
      * @param level = 0 - mipmapLevel
      */
-    protected _attachTexture(attachment: GL, texture: WEBGLTexture, layer: number, level: number): void;
+    protected _attachTextureView(attachment: GL, textureView: WEBGLTextureView): void;
 }
 //# sourceMappingURL=webgl-framebuffer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAMtD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,YAAY,CAAC;AAEzD,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,sBAAsB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IAEzB,IAAI,OAAO,wCAEV;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAsDxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAUxB,mGAAmG;cAChF,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAW5E;;OAEG;cACgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA2BzE,4BAA4B;IAC5B,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,YAAY;IAqC/E;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CACtB,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,IAAI;CA2BR"}
+{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAGtD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,YAAY,CAAC;AAEzD,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,sBAAsB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IAEzB,gBAAgB,EAAE,gBAAgB,EAAE,CAAM;IAC1C,sBAAsB,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAE3C,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAsDxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAUxB,mGAAmG;cAChF,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAW5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA6BE;IAEF,4BAA4B;IAC5B,SAAS,CAAC,cAAc,CAAC,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;IAQlF;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;CA8BlF"}