@luma.gl/webgl 9.1.0-alpha.10 → 9.1.0-alpha.13

package/src/adapter/resources/webgl-framebuffer.ts

@@ -39,39 +39,7 @@ export class WEBGLFramebuffer extends Framebuffer {
       // Auto create textures for attachments if needed
       this.autoCreateAttachmentTextures();
 
-      /** Attach from a map of attachments */
-      // @ts-expect-error native bindFramebuffer is overridden by our state tracker
-      const prevHandle: WebGLFramebuffer | null = this.gl.bindFramebuffer(
-        GL.FRAMEBUFFER,
-        this.handle
-      );
-
-      // Walk the attachments
-      for (let i = 0; i < this.colorAttachments.length; ++i) {
-        const attachment = this.colorAttachments[i];
-        const attachmentPoint = GL.COLOR_ATTACHMENT0 + i;
-        if (attachment) {
-          this._attachTexture(attachmentPoint, attachment);
-        }
-      }
-
-      if (this.depthStencilAttachment) {
-        this._attachTexture(
-          getDepthStencilAttachmentWebGL(this.depthStencilAttachment.props.format),
-          this.depthStencilAttachment
-        );
-      }
-
-      /** Check the status */
-      // @ts-expect-error
-      if (props.check !== false) {
-        const status = this.gl.checkFramebufferStatus(GL.FRAMEBUFFER) as GL;
-        if (status !== GL.FRAMEBUFFER_COMPLETE) {
-          throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
-        }
-      }
-
-      this.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle);
+      this.updateAttachments();
     }
   }
 
@@ -84,6 +52,42 @@ export class WEBGLFramebuffer extends Framebuffer {
     }
   }
 
+  protected updateAttachments(): void {
+    /** Attach from a map of attachments */
+    // @ts-expect-error native bindFramebuffer is overridden by our state tracker
+    const prevHandle: WebGLFramebuffer | null = this.gl.bindFramebuffer(
+      GL.FRAMEBUFFER,
+      this.handle
+    );
+
+    // Walk the attachments
+    for (let i = 0; i < this.colorAttachments.length; ++i) {
+      const attachment = this.colorAttachments[i];
+      if (attachment) {
+        const attachmentPoint = GL.COLOR_ATTACHMENT0 + i;
+        this._attachTextureView(attachmentPoint, attachment);
+      }
+    }
+
+    if (this.depthStencilAttachment) {
+      const attachmentPoint = getDepthStencilAttachmentWebGL(
+        this.depthStencilAttachment.props.format
+      );
+      this._attachTextureView(attachmentPoint, this.depthStencilAttachment);
+    }
+
+    /** Check the status */
+    // @ts-expect-error
+    if (this.props.check !== false) {
+      const status = this.gl.checkFramebufferStatus(GL.FRAMEBUFFER) as GL;
+      if (status !== GL.FRAMEBUFFER_COMPLETE) {
+        throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
+      }
+    }
+
+    this.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle);
+  }
+
   // PRIVATE
 
   /** In WebGL we must use renderbuffers for depth/stencil attachments (unless we have extensions) */
@@ -129,15 +133,6 @@ export class WEBGLFramebuffer extends Framebuffer {
   }
   */
 
-  /** Attach one attachment */
-  protected _attachTexture(attachmentPoint: GL, textureView: WEBGLTextureView): void {
-    // if (attachment instanceof WEBGLRenderbuffer) {
-    //   this._attachWEBGLRenderbuffer(attachmentPoint, attachment);
-    //   return attachment;
-    // }
-    this._attachTextureView(attachmentPoint, textureView);
-  }
-
   /**
    * @param attachment
    * @param texture

package/src/adapter/resources/webgl-render-pass.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {NumericArray} from '@math.gl/types';
+import {NumericArray, NumberArray4} from '@math.gl/types';
 import {RenderPass, RenderPassProps, RenderPassParameters} from '@luma.gl/core';
 import {WebGLDevice} from '../webgl-device';
 import {GL, GLParameters} from '@luma.gl/constants';
@@ -85,11 +85,11 @@ export class WEBGLRenderPass extends RenderPass {
     if (parameters.viewport) {
       // WebGPU viewports are 6 coordinates (X, Y, Z)
       if (parameters.viewport.length >= 6) {
-        glParameters.viewport = parameters.viewport.slice(0, 4);
+        glParameters.viewport = parameters.viewport.slice(0, 4) as NumberArray4;
         glParameters.depthRange = [parameters.viewport[4], parameters.viewport[5]];
       } else {
         // WebGL viewports are 4 coordinates (X, Y)
-        glParameters.viewport = parameters.viewport;
+        glParameters.viewport = parameters.viewport as NumberArray4;
       }
     }
     if (parameters.scissorRect) {

package/src/adapter/resources/webgl-render-pipeline.ts

@@ -2,9 +2,16 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {RenderPipelineProps, RenderPipelineParameters, PrimitiveTopology} from '@luma.gl/core';
-import type {ShaderLayout, UniformValue, Binding} from '@luma.gl/core';
-import type {RenderPass, VertexArray} from '@luma.gl/core';
+import type {
+  RenderPipelineProps,
+  RenderPipelineParameters,
+  PrimitiveTopology,
+  ShaderLayout,
+  UniformValue,
+  Binding,
+  RenderPass,
+  VertexArray
+} from '@luma.gl/core';
 import {RenderPipeline, log} from '@luma.gl/core';
 // import {getAttributeInfosFromLayouts} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';

package/src/adapter/resources/webgl-texture.ts

@@ -52,7 +52,7 @@ import {WEBGLTextureView} from './webgl-texture-view';
 import {
   initializeTextureStorage,
   // clearMipLevel,
-  copyCPUImageToMipLevel,
+  copyExternalImageToMipLevel,
   copyCPUDataToMipLevel,
   // copyGPUBufferToMipLevel,
   getWebGLTextureTarget
@@ -350,10 +350,38 @@ export class WEBGLTexture extends Texture {
   }): {width: number; height: number} {
     const size = Texture.getExternalImageSize(options.image);
     const opts = {...Texture.defaultCopyExternalImageOptions, ...size, ...options};
-    const {depth, mipLevel: lodLevel, image} = opts;
-    this.bind();
-    this._setMipLevel(depth, lodLevel, image);
-    this.unbind();
+
+    const {image, depth, mipLevel, x, y, z} = opts;
+    let {width, height} = opts;
+    const {dimension, glTarget, glFormat, glInternalFormat, glType} = this;
+
+    // WebGL will error if we try to copy outside the bounds of the texture
+    width = Math.min(width, size.width - x);
+    height = Math.min(height, size.height - y);
+
+    // WebGL does not yet support sourceX/sourceY in copyExternalImage; requires copyTexSubImage2D from a framebuffer'
+
+    if (options.sourceX || options.sourceY) {
+      throw new Error(
+        'WebGL does not yet support sourceX/sourceY in copyExternalImage; requires copyTexSubImage2D from a framebuffer'
+      );
+    }
+
+    copyExternalImageToMipLevel(this.device.gl, this.handle, image, {
+      dimension,
+      mipLevel,
+      x,
+      y,
+      z,
+      width,
+      height,
+      depth,
+      glFormat,
+      glInternalFormat,
+      glType,
+      glTarget
+    });
+
     return {width: opts.width, height: opts.height};
   }
 
@@ -601,7 +629,7 @@ export class WEBGLTexture extends Texture {
    */
   protected _setMipLevel(
     depth: number,
-    level: number,
+    mipLevel: number,
     textureData: Texture2DData,
     glTarget: GL = this.glTarget
   ) {
@@ -611,7 +639,12 @@ export class WEBGLTexture extends Texture {
     // }
 
     if (Texture.isExternalImage(textureData)) {
-      copyCPUImageToMipLevel(this.device.gl, textureData, {...this, depth, level, glTarget});
+      copyExternalImageToMipLevel(this.device.gl, this.handle, textureData, {
+        ...this,
+        depth,
+        mipLevel,
+        glTarget
+      });
       return;
     }
 
@@ -620,7 +653,7 @@ export class WEBGLTexture extends Texture {
       copyCPUDataToMipLevel(this.device.gl, textureData.data, {
         ...this,
         depth,
-        level,
+        mipLevel,
         glTarget
       });
       return;

package/src/adapter/webgl-device.ts

@@ -3,8 +3,17 @@
 // Copyright (c) vis.gl contributors
 
 import type {TypedArray} from '@math.gl/types';
-import type {DeviceProps, DeviceInfo, CanvasContextProps, TextureFormat} from '@luma.gl/core';
-import type {Buffer, Texture, Framebuffer, VertexArray, VertexArrayProps} from '@luma.gl/core';
+import type {
+  DeviceProps,
+  DeviceInfo,
+  CanvasContextProps,
+  TextureFormat,
+  Buffer,
+  Texture,
+  Framebuffer,
+  VertexArray,
+  VertexArrayProps
+} from '@luma.gl/core';
 import {Device, CanvasContext, log} from '@luma.gl/core';
 import type {GLExtensions} from '@luma.gl/constants';
 import {WebGLStateTracker} from '../context/state-tracker/webgl-state-tracker';
@@ -59,14 +68,14 @@ import {WEBGLVertexArray} from './resources/webgl-vertex-array';
 import {WEBGLTransformFeedback} from './resources/webgl-transform-feedback';
 import {WEBGLQuerySet} from './resources/webgl-query-set';
 
-import {readPixelsToArray, readPixelsToBuffer} from '../classic/copy-and-blit';
+import {readPixelsToArray, readPixelsToBuffer} from './helpers/webgl-texture-utils';
 import {
   setGLParameters,
   getGLParameters,
   resetGLParameters
 } from '../context/parameters/unified-parameter-api';
 import {withGLParameters} from '../context/state-tracker/with-parameters';
-import {clear} from '../classic/clear';
+import {clear} from '../deprecated/clear';
 import {getWebGLExtension} from '../context/helpers/webgl-extensions';
 
 /** WebGPU style Device API for a WebGL context */

package/src/{classic → deprecated}/accessor.ts

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Buffer} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
-import {getTypedArrayFromGLType} from './typed-array-utils';
+import {Buffer, log} from '@luma.gl/core';
+import {GL, GLDataType, GLPixelType} from '@luma.gl/constants';
+import {TypedArrayConstructor} from '@math.gl/types';
 
 /**
  * Attribute descriptor object
@@ -81,6 +81,7 @@ export class Accessor implements AccessorObject {
   }
 
   constructor(...accessors: AccessorObject[]) {
+    log.warn('Accessor will be removed in next minor release');
     accessors.forEach(accessor => this._assign(accessor)); // Merge in sequence
     Object.freeze(this);
   }
@@ -180,5 +181,45 @@ export class Accessor implements AccessorObject {
   }
 }
 
+/**
+ * Converts GL constant to corresponding TYPED ARRAY
+ * Used to auto deduce gl parameter types
+ * @deprecated Use getTypedArrayFromDataType
+ * @param glType
+ * @param param1
+ * @returns
+ */
+// eslint-disable-next-line complexity
+function getTypedArrayFromGLType(
+  glType: GLDataType | GLPixelType,
+  options?: {
+    clamped?: boolean;
+  }
+): TypedArrayConstructor {
+  const {clamped = true} = options || {};
+  // Sorted in some order of likelihood to reduce amount of comparisons
+  switch (glType) {
+    case GL.FLOAT:
+      return Float32Array;
+    case GL.UNSIGNED_SHORT:
+    case GL.UNSIGNED_SHORT_5_6_5:
+    case GL.UNSIGNED_SHORT_4_4_4_4:
+    case GL.UNSIGNED_SHORT_5_5_5_1:
+      return Uint16Array;
+    case GL.UNSIGNED_INT:
+      return Uint32Array;
+    case GL.UNSIGNED_BYTE:
+      return clamped ? Uint8ClampedArray : Uint8Array;
+    case GL.BYTE:
+      return Int8Array;
+    case GL.SHORT:
+      return Int16Array;
+    case GL.INT:
+      return Int32Array;
+    default:
+      throw new Error('Failed to deduce typed array type from GL constant');
+  }
+}
+
 // TEST EXPORTS
 export {DEFAULT_ACCESSOR_VALUES};

package/src/{classic → deprecated}/clear.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Device, Framebuffer} from '@luma.gl/core';
+import {Device, Framebuffer, log} from '@luma.gl/core';
 import {WebGLDevice} from '../adapter/webgl-device';
 import {withGLParameters} from '../context/state-tracker/with-parameters';
 
@@ -24,6 +24,8 @@ export function clear(
   device: Device,
   options?: {framebuffer?: Framebuffer; color?: any; depth?: any; stencil?: any}
 ): void {
+  log.warn('clear will be removed in next minor release');
+
   const {framebuffer = null, color = null, depth = null, stencil = null} = options || {};
   const parameters: any = {};
 

package/src/index.ts

@@ -38,7 +38,7 @@ export {WEBGLVertexArray} from './adapter/resources/webgl-vertex-array';
 export {WEBGLTransformFeedback} from './adapter/resources/webgl-transform-feedback';
 
 // WebGL adapter classes
-export {Accessor} from './classic/accessor';
+export {Accessor} from './deprecated/accessor';
 export type {AccessorObject} from './types';
 
 // Unified parameter API

package/src/utils/fill-array.ts

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {NumberArray} from '@math.gl/types';
+import type {NumericArray} from '@math.gl/types';
 
 // Uses copyWithin to significantly speed up typed array value filling
 export function fillArray(options: {
-  target: NumberArray;
-  source: NumberArray;
+  target: NumericArray;
+  source: NumericArray;
   start?: number;
   count?: number;
-}): NumberArray {
+}): NumericArray {
   const {target, source, start = 0, count = 1} = options;
   const length = source.length;
   const total = count * length;

package/dist/classic/accessor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"accessor.d.ts","sourceRoot":"","sources":["../../src/classic/accessor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sCAAsC;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,QAAA,MAAM,uBAAuB;;;;;;;;CAQ5B,CAAC;AAEF,qBAAa,QAAS,YAAW,cAAc;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,cAAc,GAAG,MAAM;IAOtE,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM;IAY1D,MAAM,CAAC,OAAO,CAAC,GAAG,SAAS,EAAE,cAAc,EAAE,GAAG,QAAQ;gBAI5C,GAAG,SAAS,EAAE,cAAc,EAAE;IAK1C,QAAQ,IAAI,MAAM;IAOlB,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAKD,OAAO,CAAC,KAAK,GAAE,cAAmB,GAAG,IAAI;CA2E1C;AAGD,OAAO,EAAC,uBAAuB,EAAC,CAAC"}

package/dist/classic/clear.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clear.d.ts","sourceRoot":"","sources":["../../src/classic/clear.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAclD;;;GAGG;AACH,wBAAgB,KAAK,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAC,GAC7E,IAAI,CAsCN;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAA;CAAC,QA2CnF"}

package/dist/classic/copy-and-blit.d.ts

@@ -1,64 +0,0 @@
-import { Buffer, Texture, Framebuffer, FramebufferProps } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
-import { WEBGLFramebuffer } from "../adapter/resources/webgl-framebuffer.js";
-import { WEBGLBuffer } from "../adapter/resources/webgl-buffer.js";
-/**
- * Copies data from a type  or a Texture object into ArrayBuffer object.
- * App can provide targetPixelArray or have it auto allocated by this method
- *  newly allocated by this method unless provided by app.
- * @deprecated Use CommandEncoder.copyTextureToBuffer and Buffer.read
- * @note Slow requires roundtrip to GPU
- *
- * @param source
- * @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;
-/**
- * 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.
- * @deprecated Use CommandEncoder
- * @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;
-/**
- * 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?: {
-    sourceX?: number;
-    sourceY?: number;
-    targetX?: number;
-    targetY?: number;
-    targetZ?: number;
-    targetMipmaplevel?: number;
-    targetInternalFormat?: number;
-    width?: number;
-    height?: number;
-}): Texture;
-/**
- * Wraps a given texture into a framebuffer object, that can be further used
- * to read data from the texture object.
- */
-export declare function toFramebuffer(texture: Texture, props?: FramebufferProps): WEBGLFramebuffer;
-//# sourceMappingURL=copy-and-blit.d.ts.map

package/dist/classic/copy-and-blit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"copy-and-blit.d.ts","sourceRoot":"","sources":["../../src/classic/copy-and-blit.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAC,gBAAgB,EAAC,kDAA+C;AAGxE,OAAO,EAAC,WAAW,EAAC,6CAA0C;AAG9D;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,GAAG,OAAO,EAC7B,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;IAEjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,UAAU,GAAG,WAAW,GAAG,YAAY,CAiDzC;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,GAAG,OAAO,EAC7B,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,WAAW,CA+Cb;AAED;;;GAGG;AAEH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,WAAW,GAAG,OAAO,EAC7B,MAAM,EAAE,OAAO,GAAG,EAAE,EACpB,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAiGT;AAYD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,CAU1F"}

package/dist/classic/copy-and-blit.js

@@ -1,194 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { Framebuffer } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
-import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from "./typed-array-utils.js";
-import { glFormatToComponents, glTypeToBytes } from "./format-utils.js";
-import { WEBGLTexture } from "../adapter/resources/webgl-texture.js";
-/**
- * Copies data from a type  or a Texture object into ArrayBuffer object.
- * App can provide targetPixelArray or have it auto allocated by this method
- *  newly allocated by this method unless provided by app.
- * @deprecated Use CommandEncoder.copyTextureToBuffer and Buffer.read
- * @note Slow requires roundtrip to GPU
- *
- * @param source
- * @param options
- * @returns pixel array,
- */
-export function readPixelsToArray(source, options) {
-    const { sourceX = 0, sourceY = 0, sourceAttachment = 36064 // TODO - support gl.readBuffer
-     } = options || {};
-    let { target = null, 
-    // following parameters are auto deduced if not provided
-    sourceWidth, sourceHeight, sourceDepth, sourceFormat, sourceType } = 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;
-    // Deduce the type from color attachment if not provided.
-    sourceType ||= framebuffer.colorAttachments[attachment]?.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);
-    const prevHandle = gl.bindFramebuffer(36160, handle);
-    gl.readPixels(sourceX, sourceY, sourceWidth, sourceHeight, sourceFormat, sourceType, target);
-    // @ts-expect-error
-    gl.bindFramebuffer(36160, prevHandle || null);
-    if (deleteFramebuffer) {
-        framebuffer.destroy();
-    }
-    return target;
-}
-/**
- * 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.
- * @deprecated Use CommandEncoder
- * @param source
- * @param options
- */
-export function readPixelsToBuffer(source, options) {
-    const { target, sourceX = 0, sourceY = 0, sourceFormat = 6408, targetByteOffset = 0 } = options || {};
-    // following parameters are auto deduced if not provided
-    let { sourceWidth, sourceHeight, sourceType } = options || {};
-    const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
-    // assert(framebuffer);
-    sourceWidth = sourceWidth || framebuffer.width;
-    sourceHeight = sourceHeight || framebuffer.height;
-    // Asynchronous read (PIXEL_PACK_BUFFER) is WebGL2 only feature
-    const webglFramebuffer = framebuffer;
-    // deduce type if not available.
-    sourceType = sourceType || 5121;
-    let webglBufferTarget = target;
-    if (!webglBufferTarget) {
-        // Create new buffer with enough size
-        const components = glFormatToComponents(sourceFormat);
-        const byteCount = glTypeToBytes(sourceType);
-        const byteLength = targetByteOffset + sourceWidth * sourceHeight * components * byteCount;
-        webglBufferTarget = webglFramebuffer.device.createBuffer({ byteLength });
-    }
-    // TODO(donmccurdy): Do we have tests to confirm this is working?
-    const commandEncoder = source.device.createCommandEncoder();
-    commandEncoder.copyTextureToBuffer({
-        source: source,
-        width: sourceWidth,
-        height: sourceHeight,
-        origin: [sourceX, sourceY],
-        destination: webglBufferTarget,
-        byteOffset: targetByteOffset
-    });
-    commandEncoder.destroy();
-    if (deleteFramebuffer) {
-        framebuffer.destroy();
-    }
-    return webglBufferTarget;
-}
-/**
- * Copy a rectangle from a Framebuffer or Texture object into a texture (at an offset)
- * @deprecated Use CommandEncoder
- */
-// eslint-disable-next-line complexity, max-statements
-export function copyToTexture(source, target, 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);
-    // assert(framebuffer);
-    const webglFramebuffer = framebuffer;
-    const { device, handle } = webglFramebuffer;
-    const isSubCopy = typeof targetX !== 'undefined' ||
-        typeof targetY !== 'undefined' ||
-        typeof targetZ !== 'undefined';
-    targetX = targetX || 0;
-    targetY = targetY || 0;
-    targetZ = targetZ || 0;
-    const prevHandle = device.gl.bindFramebuffer(36160, handle);
-    // TODO - support gl.readBuffer (WebGL2 only)
-    // const prevBuffer = gl.readBuffer(attachment);
-    // assert(target);
-    let texture = null;
-    let textureTarget;
-    if (target instanceof WEBGLTexture) {
-        texture = target;
-        width = Number.isFinite(width) ? width : texture.width;
-        height = Number.isFinite(height) ? height : texture.height;
-        texture?.bind(0);
-        // @ts-ignore
-        textureTarget = texture.target;
-    }
-    else {
-        // @ts-ignore
-        textureTarget = target;
-    }
-    if (!isSubCopy) {
-        device.gl.copyTexImage2D(textureTarget, targetMipmaplevel, targetInternalFormat, sourceX, sourceY, width, height, 0 /* border must be 0 */);
-    }
-    else {
-        switch (textureTarget) {
-            case 3553:
-            case 34067:
-                device.gl.copyTexSubImage2D(textureTarget, targetMipmaplevel, targetX, targetY, sourceX, sourceY, width, height);
-                break;
-            case 35866:
-            case 32879:
-                device.gl.copyTexSubImage3D(textureTarget, targetMipmaplevel, targetX, targetY, targetZ, sourceX, sourceY, width, height);
-                break;
-            default:
-        }
-    }
-    if (texture) {
-        texture.unbind();
-    }
-    // @ts-expect-error
-    device.gl.bindFramebuffer(36160, prevHandle || null);
-    if (deleteFramebuffer) {
-        framebuffer.destroy();
-    }
-    return texture;
-}
-function getFramebuffer(source) {
-    if (!(source instanceof Framebuffer)) {
-        return { framebuffer: toFramebuffer(source), deleteFramebuffer: true };
-    }
-    return { framebuffer: source, deleteFramebuffer: false };
-}
-/**
- * Wraps a given texture into a framebuffer object, that can be further used
- * to read data from the texture object.
- */
-export function toFramebuffer(texture, props) {
-    const { device, width, height, id } = texture;
-    const framebuffer = device.createFramebuffer({
-        ...props,
-        id: `framebuffer-for-${id}`,
-        width,
-        height,
-        colorAttachments: [texture]
-    });
-    return framebuffer;
-}
-// eslint-disable-next-line max-params
-function getPixelArray(pixelArray, type, format, width, height, depth) {
-    if (pixelArray) {
-        return pixelArray;
-    }
-    // Allocate pixel array if not already available, using supplied type
-    type = type || 5121;
-    const ArrayType = getTypedArrayFromGLType(type, { clamped: false });
-    const components = glFormatToComponents(format);
-    // TODO - check for composite type (components = 1).
-    return new ArrayType(width * height * components);
-}

package/dist/classic/format-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"format-utils.d.ts","sourceRoot":"","sources":["../../src/classic/format-utils.ts"],"names":[],"mappings":"AAOA,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,qBAmB1C;AAGD,wBAAgB,aAAa,CAAC,IAAI,KAAA,iBAcjC"}

package/dist/classic/typed-array-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"typed-array-utils.d.ts","sourceRoot":"","sources":["../../src/classic/typed-array-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAK,UAAU,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAI/D;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,UAAU,GAAG,UAAU,CAuB3E;AAED;;;;;;;GAOG;AAEH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,GAAG,WAAW,EAChC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,qBAAqB,CAwBvB;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAChC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,GAAG,IAAI,CAgBP;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAC,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GAAG;IACvF,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAaA"}