@luma.gl/webgl 9.1.0-alpha.15 → 9.1.0-alpha.17

package/dist/adapter/helpers/webgl-texture-utils.d.ts

@@ -1,7 +1,7 @@
+import { TypedArray } from '@math.gl/types';
 import type { ExternalImage } from '@luma.gl/core';
 import { Buffer, Texture, Framebuffer, FramebufferProps } from '@luma.gl/core';
 import { GL, GLTextureTarget, GLTextureCubeMapTarget, GLTexelDataFormat, GLPixelType } from '@luma.gl/constants';
-import { TypedArray } from '@math.gl/types';
 import { WEBGLFramebuffer } from "../resources/webgl-framebuffer.js";
 import { WEBGLBuffer } from "../resources/webgl-buffer.js";
 /**
@@ -71,7 +71,9 @@ export declare function initializeTextureStorage(gl: WebGL2RenderingContext, lev
 /**
  * Copy a region of compressed data from a GPU memory buffer into this texture.
  */
-export declare function copyExternalImageToMipLevel(gl: WebGL2RenderingContext, handle: WebGLTexture, image: ExternalImage, options: WebGLCopyTextureOptions): void;
+export declare function copyExternalImageToMipLevel(gl: WebGL2RenderingContext, handle: WebGLTexture, image: ExternalImage, options: WebGLCopyTextureOptions & {
+    flipY?: boolean;
+}): void;
 /**
  * Copy a region of data from a CPU memory buffer into this texture.
  */
@@ -93,7 +95,7 @@ export declare function getWebGLCubeFaceTarget(glTarget: GLTextureTarget, dimens
  * 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 {dimension, width, height, depth = 0, mipLevel = 0} = options;
   const {glInternalFormat, glFormat, glType, compressed} = options;
   const glTarget = getWebGLCubeFaceTarget(options.glTarget, dimension, depth);
 
@@ -102,10 +104,10 @@ export function clearMipLevel(gl: WebGL2RenderingContext, options: WebGLSetTextu
     case '3d':
       if (compressed) {
         // prettier-ignore
-        gl.compressedTexImage3D(glTarget, level, glInternalFormat, width, height, depth, BORDER, null);
+        gl.compressedTexImage3D(glTarget, mipLevel, glInternalFormat, width, height, depth, BORDER, null);
       } else {
         // prettier-ignore
-        gl.texImage3D( glTarget, level, glInternalFormat, width, height, depth, BORDER, glFormat, glType, null);
+        gl.texImage3D( glTarget, mipLevel, glInternalFormat, width, height, depth, BORDER, glFormat, glType, null);
       }
       break;
 
@@ -113,10 +115,10 @@ export function clearMipLevel(gl: WebGL2RenderingContext, options: WebGLSetTextu
     case 'cube':
       if (compressed) {
         // prettier-ignore
-        gl.compressedTexImage2D(glTarget, level, glInternalFormat, width, height, BORDER, null);
+        gl.compressedTexImage2D(glTarget, mipLevel, glInternalFormat, width, height, BORDER, null);
       } else {
         // prettier-ignore
-        gl.texImage2D(glTarget, level, glInternalFormat, width, height, BORDER, glFormat, glType, null);
+        gl.texImage2D(glTarget, mipLevel, glInternalFormat, width, height, BORDER, glFormat, glType, null);
       }
       break;
 
@@ -124,7 +126,7 @@ export function clearMipLevel(gl: WebGL2RenderingContext, options: WebGLSetTextu
       throw new Error(dimension);
   }
 }
-
+  */
 /**
  * Set a texture mip level to the contents of an external image.
  * Wrapper for the messy WebGL texture API
@@ -305,6 +307,27 @@ export function setMipLevelFromGPUBuffer(
   gl.bindBuffer(GL.PIXEL_UNPACK_BUFFER, null);
 }
 */
+export type ReadPixelsToArrayOptions = {
+    sourceX?: number;
+    sourceY?: number;
+    sourceFormat?: number;
+    sourceAttachment?: number;
+    target?: Uint8Array | Uint16Array | Float32Array;
+    sourceWidth?: number;
+    sourceHeight?: number;
+    sourceDepth?: number;
+    sourceType?: number;
+};
+export type ReadPixelsToBufferOptions = {
+    sourceX?: number;
+    sourceY?: number;
+    sourceFormat?: number;
+    target?: Buffer;
+    targetByteOffset?: number;
+    sourceWidth?: number;
+    sourceHeight?: number;
+    sourceType?: number;
+};
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
  * App can provide targetPixelArray or have it auto allocated by this method
@@ -316,17 +339,7 @@ export function setMipLevelFromGPUBuffer(
  * @param options
  * @returns pixel array,
  */
-export declare function readPixelsToArray(source: Framebuffer | Texture, options?: {
-    sourceX?: number;
-    sourceY?: number;
-    sourceFormat?: number;
-    sourceAttachment?: number;
-    target?: Uint8Array | Uint16Array | Float32Array;
-    sourceWidth?: number;
-    sourceHeight?: number;
-    sourceDepth?: number;
-    sourceType?: number;
-}): Uint8Array | Uint16Array | Float32Array;
+export declare function readPixelsToArray(source: Framebuffer | Texture, options?: ReadPixelsToArrayOptions): Uint8Array | Uint16Array | Float32Array;
 /**
  * Copies data from a Framebuffer or a Texture object into a Buffer object.
  * NOTE: doesn't wait for copy to be complete, it programs GPU to perform a DMA transffer.
@@ -334,21 +347,12 @@ export declare function readPixelsToArray(source: Framebuffer | Texture, options
  * @param source
  * @param options
  */
-export declare function readPixelsToBuffer(source: Framebuffer | Texture, options?: {
-    sourceX?: number;
-    sourceY?: number;
-    sourceFormat?: number;
-    target?: Buffer;
-    targetByteOffset?: number;
-    sourceWidth?: number;
-    sourceHeight?: number;
-    sourceType?: number;
-}): WEBGLBuffer;
+export declare function readPixelsToBuffer(source: Framebuffer | Texture, options?: ReadPixelsToBufferOptions): WEBGLBuffer;
 /**
  * Copy a rectangle from a Framebuffer or Texture object into a texture (at an offset)
  * @deprecated Use CommandEncoder
  */
-export declare function copyToTexture(source: Framebuffer | Texture, target: Texture | GL, options?: {
+export declare function copyToTexture(sourceTexture: Framebuffer | Texture, destinationTexture: Texture | GL, options?: {
     sourceX?: number;
     sourceY?: number;
     targetX?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-texture-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webgl-texture-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"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"}

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

@@ -6,6 +6,7 @@ import { GL } from '@luma.gl/constants';
 import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from "./typed-array-utils.js";
 import { glFormatToComponents, glTypeToBytes } from "./format-utils.js";
 import { WEBGLTexture } from "../resources/webgl-texture.js";
+import { withGLParameters } from "../../context/state-tracker/with-parameters.js";
 /** A "border" parameter is required in many WebGL texture APIs, but must always be 0... */
 const BORDER = 0;
 /**
@@ -41,24 +42,27 @@ export function copyExternalImageToMipLevel(gl, handle, image, options) {
     const { x = 0, y = 0, z = 0 } = options;
     const { glFormat, glType } = options;
     const glTarget = getWebGLCubeFaceTarget(options.glTarget, dimension, depth);
-    switch (dimension) {
-        case '2d-array':
-        case '3d':
-            gl.bindTexture(glTarget, handle);
-            // prettier-ignore
-            gl.texSubImage3D(glTarget, mipLevel, x, y, z, width, height, depth, glFormat, glType, image);
-            gl.bindTexture(glTarget, null);
-            break;
-        case '2d':
-        case 'cube':
-            gl.bindTexture(glTarget, handle);
-            // prettier-ignore
-            gl.texSubImage2D(glTarget, mipLevel, x, y, width, height, glFormat, glType, image);
-            gl.bindTexture(glTarget, null);
-            break;
-        default:
-            throw new Error(dimension);
-    }
+    const glParameters = options.flipY ? { [37440]: true } : {};
+    withGLParameters(gl, glParameters, () => {
+        switch (dimension) {
+            case '2d-array':
+            case '3d':
+                gl.bindTexture(glTarget, handle);
+                // prettier-ignore
+                gl.texSubImage3D(glTarget, mipLevel, x, y, z, width, height, depth, glFormat, glType, image);
+                gl.bindTexture(glTarget, null);
+                break;
+            case '2d':
+            case 'cube':
+                gl.bindTexture(glTarget, handle);
+                // prettier-ignore
+                gl.texSubImage2D(glTarget, mipLevel, x, y, width, height, glFormat, glType, image);
+                gl.bindTexture(glTarget, null);
+                break;
+            default:
+                throw new Error(dimension);
+        }
+    });
 }
 /**
  * Copy a region of data from a CPU memory buffer into this texture.
@@ -156,224 +160,6 @@ export function getWebGLTextureTarget(dimension) {
 export function getWebGLCubeFaceTarget(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 = getWebGLCubeFaceTarget(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 = getWebGLCubeFaceTarget(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 = getWebGLCubeFaceTarget(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 = getWebGLCubeFaceTarget(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);
-}
-*/
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
  * App can provide targetPixelArray or have it auto allocated by this method
@@ -386,7 +172,7 @@ export function setMipLevelFromGPUBuffer(
  * @returns pixel array,
  */
 export function readPixelsToArray(source, options) {
-    const { sourceX = 0, sourceY = 0, sourceAttachment = 36064 // TODO - support gl.readBuffer
+    const { sourceX = 0, sourceY = 0, sourceAttachment = 0 // TODO - support gl.readBuffer
      } = options || {};
     let { target = null, 
     // following parameters are auto deduced if not provided
@@ -394,24 +180,33 @@ export function readPixelsToArray(source, options) {
     const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
     // assert(framebuffer);
     const { gl, handle } = framebuffer;
-    const attachment = sourceAttachment - 36064;
     sourceWidth ||= framebuffer.width;
     sourceHeight ||= framebuffer.height;
-    // TODO - Set and unset gl.readBuffer
-    // if (sourceAttachment === GL.COLOR_ATTACHMENT0 && handle === null) {
-    //   sourceAttachment = GL.FRONT;
-    // }
-    sourceDepth = framebuffer.colorAttachments[attachment]?.texture?.depth || 1;
-    sourceFormat ||= framebuffer.colorAttachments[attachment]?.texture?.glFormat || 6408;
+    const texture = framebuffer.colorAttachments[sourceAttachment]?.texture;
+    if (!texture) {
+        throw new Error(`Invalid framebuffer attachment ${sourceAttachment}`);
+    }
+    sourceDepth = texture?.depth || 1;
+    sourceFormat ||= texture?.glFormat || 6408;
     // Deduce the type from color attachment if not provided.
-    sourceType ||= framebuffer.colorAttachments[attachment]?.texture?.glType || 5121;
+    sourceType ||= texture?.glType || 5121;
     // Deduce type and allocated pixelArray if needed
     target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight, sourceDepth);
     // Pixel array available, if necessary, deduce type from it.
     sourceType = sourceType || getGLTypeFromTypedArray(target);
+    // Note: luma.gl overrides bindFramebuffer so that we can reliably restore the previous framebuffer (this is the only function for which we do that)
     const prevHandle = gl.bindFramebuffer(36160, handle);
+    // Select the color attachment to read from
+    gl.readBuffer(36064 + sourceAttachment);
+    // There is a lot of hedging in the WebGL2 spec about what formats are guaranteed to be readable
+    // (It should always be possible to read RGBA/UNSIGNED_BYTE, but most other combinations are not guaranteed)
+    // Querying is possible but expensive:
+    // const {device} = framebuffer;
+    // texture.glReadFormat ||= gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_FORMAT);
+    // texture.glReadType ||= gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_TYPE);
+    // console.log('params', device.getGLKey(texture.glReadFormat), device.getGLKey(texture.glReadType));
     gl.readPixels(sourceX, sourceY, sourceWidth, sourceHeight, sourceFormat, sourceType, target);
-    // @ts-expect-error
+    gl.readBuffer(36064);
     gl.bindFramebuffer(36160, prevHandle || null);
     if (deleteFramebuffer) {
         framebuffer.destroy();
@@ -448,11 +243,11 @@ export function readPixelsToBuffer(source, options) {
     // TODO(donmccurdy): Do we have tests to confirm this is working?
     const commandEncoder = source.device.createCommandEncoder();
     commandEncoder.copyTextureToBuffer({
-        source: source,
+        sourceTexture: source,
         width: sourceWidth,
         height: sourceHeight,
         origin: [sourceX, sourceY],
-        destination: webglBufferTarget,
+        destinationBuffer: webglBufferTarget,
         byteOffset: targetByteOffset
     });
     commandEncoder.destroy();
@@ -466,14 +261,14 @@ export function readPixelsToBuffer(source, options) {
  * @deprecated Use CommandEncoder
  */
 // eslint-disable-next-line complexity, max-statements
-export function copyToTexture(source, target, options) {
+export function copyToTexture(sourceTexture, destinationTexture, options) {
     const { sourceX = 0, sourceY = 0, 
     // attachment = GL.COLOR_ATTACHMENT0, // TODO - support gl.readBuffer
     targetMipmaplevel = 0, targetInternalFormat = 6408 } = options || {};
     let { targetX, targetY, targetZ, width, // defaults to target width
     height // defaults to target height
      } = options || {};
-    const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
+    const { framebuffer, deleteFramebuffer } = getFramebuffer(sourceTexture);
     // assert(framebuffer);
     const webglFramebuffer = framebuffer;
     const { device, handle } = webglFramebuffer;
@@ -489,8 +284,8 @@ export function copyToTexture(source, target, options) {
     // assert(target);
     let texture = null;
     let textureTarget;
-    if (target instanceof WEBGLTexture) {
-        texture = target;
+    if (destinationTexture instanceof WEBGLTexture) {
+        texture = destinationTexture;
         width = Number.isFinite(width) ? width : texture.width;
         height = Number.isFinite(height) ? height : texture.height;
         texture?.bind(0);
@@ -549,14 +344,15 @@ export function toFramebuffer(texture, props) {
     return framebuffer;
 }
 // eslint-disable-next-line max-params
-function getPixelArray(pixelArray, type, format, width, height, depth) {
+function getPixelArray(pixelArray, glType, glFormat, width, height, depth) {
     if (pixelArray) {
         return pixelArray;
     }
+    // const formatInfo = decodeTextureFormat(format);
     // Allocate pixel array if not already available, using supplied type
-    type = type || 5121;
-    const ArrayType = getTypedArrayFromGLType(type, { clamped: false });
-    const components = glFormatToComponents(format);
+    glType ||= 5121;
+    const ArrayType = getTypedArrayFromGLType(glType, { clamped: false });
+    const components = glFormatToComponents(glFormat);
     // TODO - check for composite type (components = 1).
     return new ArrayType(width * height * components);
 }

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

@@ -1,6 +1,6 @@
 import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
 import { CommandBuffer } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GL, GLTextureTarget, GLTextureCubeMapTarget } from '@luma.gl/constants';
 import { WebGLDevice } from "../webgl-device.js";
 type CopyBufferToBufferCommand = {
     name: 'copy-buffer-to-buffer';
@@ -18,14 +18,71 @@ type CopyTextureToTextureCommand = {
     name: 'copy-texture-to-texture';
     options: CopyTextureToTextureOptions;
 };
-type Command = CopyBufferToBufferCommand | CopyBufferToTextureCommand | CopyTextureToBufferCommand | CopyTextureToTextureCommand;
+type ClearTextureCommand = {
+    name: 'clear-texture';
+    options: {};
+};
+type ReadTextureCommand = {
+    name: 'read-texture';
+    options: {};
+};
+type Command = CopyBufferToBufferCommand | CopyBufferToTextureCommand | CopyTextureToBufferCommand | CopyTextureToTextureCommand | ClearTextureCommand | ReadTextureCommand;
 export declare class WEBGLCommandBuffer extends CommandBuffer {
     device: WebGLDevice;
     commands: Command[];
     constructor(device: WebGLDevice);
     submitCommands(commands?: Command[]): void;
 }
+/** Clear one mip level of a texture *
+function _clearTexture(device: WebGLDevice, options: ClearTextureOptions) {
+  const BORDER = 0;
+  const {dimension, width, height, depth = 0, mipLevel = 0} = options;
+  const {glInternalFormat, glFormat, glType, compressed} = options;
+  const glTarget = getWebGLCubeFaceTarget(options.glTarget, dimension, depth);
+
+  switch (dimension) {
+    case '2d-array':
+    case '3d':
+      if (compressed) {
+        // prettier-ignore
+        device.gl.compressedTexImage3D(glTarget, mipLevel, glInternalFormat, width, height, depth, BORDER, null);
+      } else {
+        // prettier-ignore
+        device.gl.texImage3D( glTarget, mipLevel, glInternalFormat, width, height, depth, BORDER, glFormat, glType, null);
+      }
+      break;
+
+    case '2d':
+    case 'cube':
+      if (compressed) {
+        // prettier-ignore
+        device.gl.compressedTexImage2D(glTarget, mipLevel, glInternalFormat, width, height, BORDER, null);
+      } else {
+        // prettier-ignore
+        device.gl.texImage2D(glTarget, mipLevel, glInternalFormat, width, height, BORDER, glFormat, glType, null);
+      }
+      break;
+
+    default:
+      throw new Error(dimension);
+  }
+}
+  */
+/**
+ * In WebGL, cube maps specify faces by overriding target instead of using the depth parameter.
+ * @note We still bind the texture using GL.TEXTURE_CUBE_MAP, but we need to use the face-specific target when setting mip levels.
+ * @returns glTarget unchanged, if dimension !== 'cube'.
+ */
+export declare function getWebGLCubeFaceTarget(glTarget: GLTextureTarget, dimension: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d', level: number): GLTextureTarget | GLTextureCubeMapTarget;
+/**
+ * Returns number of components in a specific readPixels WebGL format
+ * @todo use shadertypes utils instead?
+ */
 export declare function glFormatToComponents(format: any): 1 | 2 | 3 | 4;
+/**
+ * Return byte count for given readPixels WebGL type
+ * @todo use shadertypes utils instead?
+ */
 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":"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"}
+{"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,EAG5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,aAAa,EAAuB,MAAM,eAAe,CAAC;AAClE,OAAO,EACL,EAAE,EACF,eAAe,EACf,sBAAsB,EAIvB,MAAM,oBAAoB,CAAC;AAE5B,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,mBAAmB,GAAG;IACzB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,KAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,GAC3B,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,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;CAuBnD;AAiPD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkCI;AAMJ;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,EAClE,KAAK,EAAE,MAAM,GACZ,eAAe,GAAG,sBAAsB,CAE1C;AAqBD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAmB1D;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAcjD"}