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

package/src/classic/copy-and-blit.ts

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {assert, Buffer, Texture, Framebuffer, FramebufferProps} from '@luma.gl/core';
+import {Buffer, Texture, Framebuffer, FramebufferProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
-import {WEBGLTextureView} from '../adapter/resources/webgl-texture-view';
 import {WEBGLFramebuffer} from '../adapter/resources/webgl-framebuffer';
 import {getGLTypeFromTypedArray, getTypedArrayFromGLType} from './typed-array-utils';
 import {glFormatToComponents, glTypeToBytes} from './format-utils';
 import {WEBGLBuffer} from '../adapter/resources/webgl-buffer';
+import {WEBGLTexture} from '../adapter/resources/webgl-texture';
 
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
@@ -33,13 +33,13 @@ export function readPixelsToArray(
     // following parameters are auto deduced if not provided
     sourceWidth?: number;
     sourceHeight?: number;
+    sourceDepth?: number;
     sourceType?: number;
   }
 ): Uint8Array | Uint16Array | Float32Array {
   const {
     sourceX = 0,
     sourceY = 0,
-    sourceFormat = GL.RGBA,
     sourceAttachment = GL.COLOR_ATTACHMENT0 // TODO - support gl.readBuffer
   } = options || {};
   let {
@@ -47,31 +47,32 @@ export function readPixelsToArray(
     // 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 as WEBGLFramebuffer;
-  sourceWidth = sourceWidth || framebuffer.width;
-  sourceHeight = sourceHeight || framebuffer.height;
+  // assert(framebuffer);
+  const {gl, handle} = framebuffer;
+  const attachment = sourceAttachment - GL.COLOR_ATTACHMENT0;
+
+  sourceWidth ||= framebuffer.width;
+  sourceHeight ||= framebuffer.height;
 
   // TODO - Set and unset gl.readBuffer
   // if (sourceAttachment === GL.COLOR_ATTACHMENT0 && handle === null) {
   //   sourceAttachment = GL.FRONT;
   // }
 
-  const attachment = sourceAttachment - GL.COLOR_ATTACHMENT0;
-  // assert(attachments[sourceAttachment]);
+  sourceDepth = framebuffer.colorAttachments[attachment]?.texture?.depth || 1;
 
+  sourceFormat ||= framebuffer.colorAttachments[attachment]?.texture?.glFormat || GL.RGBA;
   // Deduce the type from color attachment if not provided.
-  sourceType =
-    sourceType ||
-    (framebuffer.colorAttachments[attachment] as WEBGLTextureView)?.texture?.type ||
-    GL.UNSIGNED_BYTE;
+  sourceType ||= framebuffer.colorAttachments[attachment]?.texture?.glType || GL.UNSIGNED_BYTE;
 
   // Deduce type and allocated pixelArray if needed
-  target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight);
+  target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight, sourceDepth);
 
   // Pixel array available, if necessary, deduce type from it.
   sourceType = sourceType || getGLTypeFromTypedArray(target);
@@ -117,12 +118,12 @@ export function readPixelsToBuffer(
   // following parameters are auto deduced if not provided
   let {sourceWidth, sourceHeight, sourceType} = options || {};
   const {framebuffer, deleteFramebuffer} = getFramebuffer(source);
-  assert(framebuffer);
+  // assert(framebuffer);
   sourceWidth = sourceWidth || framebuffer.width;
   sourceHeight = sourceHeight || framebuffer.height;
 
   // Asynchronous read (PIXEL_PACK_BUFFER) is WebGL2 only feature
-  const webglFramebuffer = framebuffer as WEBGLFramebuffer;
+  const webglFramebuffer = framebuffer;
 
   // deduce type if not available.
   sourceType = sourceType || GL.UNSIGNED_BYTE;
@@ -193,8 +194,8 @@ export function copyToTexture(
   } = options || {};
 
   const {framebuffer, deleteFramebuffer} = getFramebuffer(source);
-  assert(framebuffer);
-  const webglFramebuffer = framebuffer as WEBGLFramebuffer;
+  // assert(framebuffer);
+  const webglFramebuffer = framebuffer;
   const {device, handle} = webglFramebuffer;
   const isSubCopy =
     typeof targetX !== 'undefined' ||
@@ -206,16 +207,18 @@ export function copyToTexture(
   const prevHandle = device.gl.bindFramebuffer(GL.FRAMEBUFFER, handle);
   // TODO - support gl.readBuffer (WebGL2 only)
   // const prevBuffer = gl.readBuffer(attachment);
-  assert(target);
-  let texture = null;
+  // assert(target);
+  let texture: WEBGLTexture | null = null;
   let textureTarget: GL;
-  if (target instanceof Texture) {
+  if (target instanceof WEBGLTexture) {
     texture = target;
     width = Number.isFinite(width) ? width : texture.width;
     height = Number.isFinite(height) ? height : texture.height;
-    texture.bind(0);
+    texture?.bind(0);
+    // @ts-ignore
     textureTarget = texture.target;
   } else {
+    // @ts-ignore
     textureTarget = target;
   }
 
@@ -274,20 +277,20 @@ export function copyToTexture(
 }
 
 function getFramebuffer(source: Texture | Framebuffer): {
-  framebuffer: Framebuffer;
+  framebuffer: WEBGLFramebuffer;
   deleteFramebuffer: boolean;
 } {
   if (!(source instanceof Framebuffer)) {
     return {framebuffer: toFramebuffer(source), deleteFramebuffer: true};
   }
-  return {framebuffer: source, deleteFramebuffer: false};
+  return {framebuffer: source as WEBGLFramebuffer, 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: Texture, props?: FramebufferProps): Framebuffer {
+export function toFramebuffer(texture: Texture, props?: FramebufferProps): WEBGLFramebuffer {
   const {device, width, height, id} = texture;
   const framebuffer = device.createFramebuffer({
     ...props,
@@ -296,15 +299,17 @@ export function toFramebuffer(texture: Texture, props?: FramebufferProps): Frame
     height,
     colorAttachments: [texture]
   });
-  return framebuffer;
+  return framebuffer as WEBGLFramebuffer;
 }
 
+// eslint-disable-next-line max-params
 function getPixelArray(
   pixelArray,
   type,
   format,
   width: number,
-  height: number
+  height: number,
+  depth?: number
 ): Uint8Array | Uint16Array | Float32Array {
   if (pixelArray) {
     return pixelArray;

package/src/classic/format-utils.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 // Returns number of components in a specific readPixels WebGL format
@@ -23,7 +22,6 @@ export function glFormatToComponents(format) {
       return 4;
     // TODO: Add support for additional WebGL2 formats
     default:
-      assert(false);
       return 0;
   }
 }
@@ -41,7 +39,6 @@ export function glTypeToBytes(type) {
       return 4;
     // TODO: Add support for additional WebGL2 types
     default:
-      assert(false);
       return 0;
   }
 }

package/src/classic/typed-array-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {TypedArray, TypedArrayConstructor} from '@luma.gl/core';
+import {TypedArray, TypedArrayConstructor} from '@math.gl/types';
 import {GL, GLDataType, GLPixelType} from '@luma.gl/constants';
 
 const ERR_TYPE_DEDUCTION = 'Failed to deduce GL constant from typed array';