@luma.gl/webgl 9.0.0-beta.4 → 9.0.0-beta.6

package/src/adapter/webgl-device.ts

@@ -1,11 +1,10 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {
   DeviceProps,
   DeviceInfo,
-  DeviceLimits,
-  DeviceFeature,
   CanvasContextProps,
   TextureFormat,
   VertexArray,
@@ -16,22 +15,16 @@ import type {
   TypedArray
 } from '@luma.gl/core';
 import {Device, CanvasContext, log, uid, assert} from '@luma.gl/core';
-import {isBrowser} from '@probe.gl/env';
-import {polyfillContext} from '../context/polyfill/polyfill-context';
+import type {GLExtensions} from '@luma.gl/constants';
 import {
   popContextState,
   pushContextState,
   trackContextState
 } from '../context/state-tracker/track-context-state';
-import {createBrowserContext} from '../context/context/create-browser-context';
-import {
-  createHeadlessContext,
-  isHeadlessGLRegistered
-} from '../context/context/create-headless-context';
-
-import {getDeviceInfo} from './device-helpers/get-device-info';
-import {getDeviceFeatures} from './device-helpers/device-features';
-import {getDeviceLimits, getWebGLLimits, WebGLLimits} from './device-helpers/device-limits';
+import {createBrowserContext} from '../context/helpers/create-browser-context';
+import {getDeviceInfo} from './device-helpers/webgl-device-info';
+import {WebGLDeviceFeatures} from './device-helpers/webgl-device-features';
+import {WebGLDeviceLimits} from './device-helpers/webgl-device-limits';
 import {WebGLCanvasContext} from './webgl-canvas-context';
 import {loadSpectorJS, initializeSpectorJS} from '../context/debug/spector';
 import {loadWebGLDeveloperTools, makeDebugContext} from '../context/debug/webgl-developer-tools';
@@ -61,7 +54,8 @@ import type {
   ComputePassProps,
   // CommandEncoder,
   CommandEncoderProps,
-  TransformFeedbackProps
+  TransformFeedbackProps,
+  QuerySetProps
 } from '@luma.gl/core';
 
 import {WEBGLBuffer} from './resources/webgl-buffer';
@@ -74,11 +68,13 @@ import {WEBGLRenderPipeline} from './resources/webgl-render-pipeline';
 import {WEBGLCommandEncoder} from './resources/webgl-command-encoder';
 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 {setGLParameters, getGLParameters} from '../context/parameters/unified-parameter-api';
 import {withGLParameters} from '../context/state-tracker/with-parameters';
 import {clear} from '../classic/clear';
+import {getWebGLExtension} from '../context/helpers/webgl-extensions';
 
 const LOG_LEVEL = 1;
 
@@ -91,29 +87,20 @@ export class WebGLDevice extends Device {
   static type: string = 'webgl';
 
   static isSupported(): boolean {
-    return typeof WebGLRenderingContext !== 'undefined' || isHeadlessGLRegistered();
+    return typeof WebGL2RenderingContext !== 'undefined';
   }
 
+  /** The underlying WebGL context */
+  readonly handle: WebGL2RenderingContext;
+  features: WebGLDeviceFeatures;
+  limits: WebGLDeviceLimits;
+
   readonly info: DeviceInfo;
   readonly canvasContext: WebGLCanvasContext;
 
-  readonly handle: WebGLRenderingContext;
-
-  get features(): Set<DeviceFeature> {
-    this._features = this._features || getDeviceFeatures(this.gl);
-    return this._features;
-  }
-
-  get limits(): DeviceLimits {
-    this._limits = this._limits || getDeviceLimits(this.gl);
-    return this._limits;
-  }
-
   readonly lost: Promise<{reason: 'destroyed'; message: string}>;
 
   private _resolveContextLost?: (value: {reason: 'destroyed'; message: string}) => void;
-  private _features?: Set<DeviceFeature>;
-  private _limits?: DeviceLimits;
 
   //
   // Static methods, expected to be present by `luma.createDevice()`
@@ -125,7 +112,7 @@ export class WebGLDevice extends Device {
    * @param gl
    * @returns
    */
-  static attach(gl: Device | WebGLRenderingContext | WebGL2RenderingContext): WebGLDevice {
+  static attach(gl: Device | WebGL2RenderingContext): WebGLDevice {
     if (gl instanceof WebGLDevice) {
       return gl;
     }
@@ -135,35 +122,39 @@ export class WebGLDevice extends Device {
       return gl.device as WebGLDevice;
     }
     if (!isWebGL(gl)) {
-      throw new Error('Invalid WebGLRenderingContext');
+      throw new Error('Invalid WebGL2RenderingContext');
     }
-    return new WebGLDevice({gl: gl as WebGLRenderingContext});
+    return new WebGLDevice({gl: gl as WebGL2RenderingContext});
   }
 
   static async create(props: DeviceProps = {}): Promise<WebGLDevice> {
     log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
 
-    // Wait for page to load. Only wait when props. canvas is string
-    // to avoid setting page onload callback unless necessary
-    if (typeof props.canvas === 'string') {
-      await CanvasContext.pageLoaded;
-    }
+    const promises: Promise<unknown>[] = [];
 
     // Load webgl and spector debug scripts from CDN if requested
-    if (log.get('debug') || props.debug) {
-      await loadWebGLDeveloperTools();
+    if (props.debug) {
+      promises.push(loadWebGLDeveloperTools());
     }
 
-    // @ts-expect-error spector not on props
-    const {spector} = props;
-    if (log.get('spector') || spector) {
-      await loadSpectorJS();
+    if (props.spector) {
+      promises.push(loadSpectorJS());
     }
 
+    // Wait for page to load: if canvas is a string we need to query the DOM for the canvas element.
+    // We only wait when props.canvas is string to avoids setting the global page onload callback unless necessary.
+    if (typeof props.canvas === 'string') {
+      promises.push(CanvasContext.pageLoaded);
+    }
+
+    // Wait for all the loads to settle before creating the context.
+    // The Device.create() functions are async, so in contrast to the constructor, we can `await` here.
+    await Promise.all(promises);
+
     log.probe(LOG_LEVEL + 1, 'DOM is loaded')();
 
     // @ts-expect-error
-    if (props.gl && props.gl.device) {
+    if (props.gl?.device) {
       return WebGLDevice.attach(props.gl);
     }
 
@@ -196,48 +187,39 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     }
 
     // Create and instrument context
-    const canvas = props.canvas || props.gl?.canvas;
+    const canvas = props.gl?.canvas || props.canvas;
     this.canvasContext = new WebGLCanvasContext(this, {...props, canvas});
 
     this.lost = new Promise<{reason: 'destroyed'; message: string}>(resolve => {
       this._resolveContextLost = resolve;
     });
 
-    const onContextLost = (event: Event) =>
-      this._resolveContextLost?.({
-        reason: 'destroyed',
-        message: 'Computer entered sleep mode, or too many apps or browser tabs are using the GPU.'
-      });
-
-    let gl: WebGLRenderingContext | WebGL2RenderingContext | null = props.gl || null;
-    gl =
-      gl ||
-      (isBrowser()
-        ? createBrowserContext(this.canvasContext.canvas, {...props, onContextLost})
-        : null);
-    gl = gl || (!isBrowser() ? createHeadlessContext({...props, onContextLost}) : null);
+    let gl: WebGL2RenderingContext | null = props.gl || null;
+    gl ||= createBrowserContext(this.canvasContext.canvas, {
+      ...props,
+      onContextLost: (event: Event) =>
+        this._resolveContextLost?.({
+          reason: 'destroyed',
+          message: 'Entered sleep mode, or too many apps or browser tabs are using the GPU.'
+        })
+    });
 
     if (!gl) {
       throw new Error('WebGL context creation failed');
     }
 
     this.handle = gl;
-    this.gl = this.handle;
-    this.gl2 = this.gl as WebGL2RenderingContext;
-    this.isWebGL2 = isWebGL2(this.gl);
-    this.isWebGL1 = !this.isWebGL2;
-    this.canvasContext.resize();
+    this.gl = gl;
 
-    // luma Device fields
-    this.info = getDeviceInfo(this.gl);
+    (this.gl as any).device = this; // Update GL context: Link webgl context back to device
+    (this.gl as any)._version = 2; // Update GL context: Store WebGL version field on gl context (HACK to identify debug contexts)
 
-    // @ts-expect-error Link webgl context back to device
-    this.gl.device = this;
-    // @ts-expect-error Annotate webgl context to handle
-    this.gl._version = this.isWebGL2 ? 2 : 1;
+    // luma Device fields
+    this.info = getDeviceInfo(this.gl, this._extensions);
+    this.features = new WebGLDeviceFeatures(this.gl, this._extensions);
+    this.limits = new WebGLDeviceLimits(this.gl);
 
-    // Add subset of WebGL2 methods to WebGL1 context
-    polyfillContext(this.gl);
+    this.canvasContext.resize();
 
     // Install context state tracking
     // @ts-expect-error - hidden parameters
@@ -249,31 +231,23 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     });
 
     // DEBUG contexts: Add debug instrumentation to the context, force log level to at least 1
-    if (isBrowser() && props.debug) {
-      this.gl = makeDebugContext(this.gl, {...props, webgl2: this.isWebGL2, throwOnError: true});
-      this.gl2 = this.gl as WebGL2RenderingContext;
+    if (props.debug) {
+      this.gl = makeDebugContext(this.gl, {...props, throwOnError: true});
       this.debug = true;
       log.level = Math.max(log.level, 1);
       log.warn('WebGL debug mode activated. Performance reduced.')();
     }
 
-    // @ts-expect-error spector not on props
-    if (isBrowser() && props.spector) {
-      const canvas = this.handle.canvas || (props.canvas as HTMLCanvasElement);
-      this.spector = initializeSpectorJS({...this.props, canvas});
+    if (props.spector) {
+      this.spectorJS = initializeSpectorJS({...this.props, canvas: this.handle.canvas});
     }
   }
 
   /**
    * Destroys the context
-   * @note Has no effect for browser contexts, there is no browser API for destroying contexts
+   * @note Has no effect for WebGL browser contexts, there is no browser API for destroying contexts
    */
-  destroy(): void {
-    const ext = this.gl.getExtension('STACKGL_destroy_context');
-    if (ext) {
-      ext.destroy();
-    }
-  }
+  destroy(): void {}
 
   get isLost(): boolean {
     return this.gl.isContextLost();
@@ -284,25 +258,15 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
   }
 
   isTextureFormatSupported(format: TextureFormat): boolean {
-    return isTextureFormatSupported(this.gl, format);
+    return isTextureFormatSupported(this.gl, format, this._extensions);
   }
 
   isTextureFormatFilterable(format: TextureFormat): boolean {
-    return isTextureFormatFilterable(this.gl, format);
+    return isTextureFormatFilterable(this.gl, format, this._extensions);
   }
 
   isTextureFormatRenderable(format: TextureFormat): boolean {
-    return isTextureFormatRenderable(this.gl, format);
-  }
-
-  // WEBGL SPECIFIC METHODS
-
-  /** Returns a WebGL2RenderingContext or throws an error */
-  assertWebGL2(): WebGL2RenderingContext {
-    if (!this.gl2) {
-      throw new Error('Requires WebGL2');
-    }
-    return this.gl2;
+    return isTextureFormatRenderable(this.gl, format, this._extensions);
   }
 
   // IMPLEMENTATION OF ABSTRACT DEVICE
@@ -336,12 +300,20 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     return new WEBGLFramebuffer(this, props);
   }
 
-  createRenderPipeline(props: RenderPipelineProps): WEBGLRenderPipeline {
-    return new WEBGLRenderPipeline(this, props);
+  createVertexArray(props: VertexArrayProps): VertexArray {
+    return new WEBGLVertexArray(this, props);
   }
 
-  override createVertexArray(props: VertexArrayProps): VertexArray {
-    return new WEBGLVertexArray(this, props);
+  createTransformFeedback(props: TransformFeedbackProps): WEBGLTransformFeedback {
+    return new WEBGLTransformFeedback(this, props);
+  }
+
+  createQuerySet(props: QuerySetProps): WEBGLQuerySet {
+    return new WEBGLQuerySet(this, props);
+  }
+
+  createRenderPipeline(props: RenderPipelineProps): WEBGLRenderPipeline {
+    return new WEBGLRenderPipeline(this, props);
   }
 
   beginRenderPass(props: RenderPassProps): WEBGLRenderPass {
@@ -356,10 +328,6 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     throw new Error('ComputePass not supported in WebGL');
   }
 
-  createTransformFeedback(props: TransformFeedbackProps): WEBGLTransformFeedback {
-    return new WEBGLTransformFeedback(this, props);
-  }
-
   private renderPass: WEBGLRenderPass | null = null;
 
   getDefaultRenderPass(): WEBGLRenderPass {
@@ -377,7 +345,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
 
   /**
    * Offscreen Canvas Support: Commit the frame
-   * https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext/commit
+   * https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext/commit
    * Chrome's offscreen canvas does not require gl.commit
    */
   submit(): void {
@@ -388,7 +356,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
 
   //
   // TEMPORARY HACKS - will be removed in v9.1
-  // 
+  //
 
   /** @deprecated - should use command encoder */
   override readPixelsToArrayWebGL(
@@ -438,42 +406,32 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     withGLParameters(this, parameters, func);
   }
 
-  override clearWebGL(options?: {framebuffer?: Framebuffer; color?: any; depth?: any; stencil?: any}): void {
+  override clearWebGL(options?: {
+    framebuffer?: Framebuffer;
+    color?: any;
+    depth?: any;
+    stencil?: any;
+  }): void {
     clear(this, options);
   }
-  
+
   //
   // WebGL-only API (not part of `Device` API)
   //
 
-  /** WebGL1 typed context. Can always be used. */
-  readonly gl: WebGLRenderingContext;
-  /** WebGL2 typed context. Need to check isWebGL2 or isWebGL1 before using. */
-  readonly gl2: WebGL2RenderingContext | null = null;
+  /** WebGL2 context. */
+  readonly gl: WebGL2RenderingContext;
   readonly debug: boolean = false;
 
-  /** `true` if this is a WebGL1 context. @note `false` if WebGL2 */
-  readonly isWebGL1: boolean;
-  /** `true` if this is a WebGL2 context. @note `false` if WebGL1 */
-  readonly isWebGL2: boolean;
-
   /** State used by luma.gl classes: TODO - move to canvasContext*/
   readonly _canvasSizeInfo = {clientWidth: 0, clientHeight: 0, devicePixelRatio: 1};
 
   /** State used by luma.gl classes - TODO - not used? */
-  readonly _extensions: Record<string, any> = {};
+  readonly _extensions: GLExtensions = {};
   _polyfilled: boolean = false;
 
   /** Instance of Spector.js (if initialized) */
-  spector;
-
-  private _webglLimits?: WebGLLimits;
-
-  /** Return WebGL specific limits */
-  get webglLimits(): WebGLLimits {
-    this._webglLimits = this._webglLimits || getWebGLLimits(this.gl);
-    return this._webglLimits;
-  }
+  spectorJS: unknown;
 
   /**
    * Triggers device (or WebGL context) loss.
@@ -481,7 +439,8 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
    */
   override loseDevice(): boolean {
     let deviceLossTriggered = false;
-    const ext = this.gl.getExtension('WEBGL_lose_context');
+    const extensions = this.getExtension('WEBGL_lose_context');
+    const ext = extensions.WEBGL_lose_context;
     if (ext) {
       deviceLossTriggered = true;
       ext.loseContext();
@@ -519,7 +478,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
    * Be aware that there are some duplicates especially for constants that are 0,
    * so this isn't guaranteed to return the right key in all cases.
    */
-  getGLKey(value: unknown, gl?: WebGLRenderingContext): string {
+  getGLKey(value: unknown, gl?: WebGL2RenderingContext): string {
     // @ts-ignore expect-error depends on settings
     gl = gl || this.gl2 || this.gl;
     const number = Number(value);
@@ -542,11 +501,15 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
    * so they need to be updated before every render
    * @todo - remember/cache values to avoid setting them unnecessarily?
    */
-  setConstantAttribute(location: number, constant: TypedArray): void {
-    this._constants = this._constants || new Array(this.limits.maxVertexAttributes).fill(null);
+  setConstantAttributeWebGL(location: number, constant: TypedArray): void {
+    const maxVertexAttributes = this.limits.maxVertexAttributes;
+    this._constants = this._constants || new Array(maxVertexAttributes).fill(null);
     const currentConstant = this._constants[location];
     if (currentConstant && compareConstantArrayValues(currentConstant, constant)) {
-      log.info(1, `setConstantAttribute(${location}) could have been skipped, value unchanged`)();
+      log.info(
+        1,
+        `setConstantAttributeWebGL(${location}) could have been skipped, value unchanged`
+      )();
     }
     this._constants[location] = constant;
 
@@ -564,27 +527,21 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         assert(false);
     }
   }
-}
 
-/** Check if supplied parameter is a WebGLRenderingContext */
-function isWebGL(gl: any): boolean {
-  if (typeof WebGLRenderingContext !== 'undefined' && gl instanceof WebGLRenderingContext) {
-    return true;
+  /** Ensure extensions are only requested once */
+  getExtension(name: keyof GLExtensions): GLExtensions {
+    getWebGLExtension(this.gl, name, this._extensions);
+    return this._extensions;
   }
-  if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
-    return true;
-  }
-  // Look for debug contexts, headless gl etc
-  return Boolean(gl && Number.isFinite(gl._version));
 }
 
 /** Check if supplied parameter is a WebGL2RenderingContext */
-function isWebGL2(gl: any): boolean {
+function isWebGL(gl: any): boolean {
   if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
     return true;
   }
   // Look for debug contexts, headless gl etc
-  return Boolean(gl && gl._version === 2);
+  return Boolean(gl && Number.isFinite(gl._version));
 }
 
 /** Set constant float array attribute */
@@ -609,8 +566,7 @@ function setConstantFloatArray(device: WebGLDevice, location: number, array: Flo
 
 /** Set constant signed int array attribute */
 function setConstantIntArray(device: WebGLDevice, location: number, array: Int32Array): void {
-  device.assertWebGL2();
-  device.gl2?.vertexAttribI4iv(location, array);
+  device.gl.vertexAttribI4iv(location, array);
   // TODO - not clear if we need to use the special forms, more testing needed
   // switch (array.length) {
   //   case 1:
@@ -631,8 +587,7 @@ function setConstantIntArray(device: WebGLDevice, location: number, array: Int32
 
 /** Set constant unsigned int array attribute */
 function setConstantUintArray(device: WebGLDevice, location: number, array: Uint32Array) {
-  device.assertWebGL2();
-  device.gl2?.vertexAttribI4uiv(location, array);
+  device.gl.vertexAttribI4uiv(location, array);
   // TODO - not clear if we need to use the special forms, more testing needed
   // switch (array.length) {
   //   case 1:

package/src/classic/accessor.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/core';
@@ -58,7 +59,7 @@ export class Accessor implements AccessorObject {
   }
 
   constructor(...accessors: AccessorObject[]) {
-    accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence
+    accessors.forEach(accessor => this._assign(accessor)); // Merge in sequence
     Object.freeze(this);
   }
 
@@ -151,10 +152,10 @@ export class Accessor implements AccessorObject {
     if (this.divisor === undefined) delete this.divisor;
     if (this.normalized === undefined) delete this.normalized;
     if (this.integer === undefined) delete this.integer;
-  
+
     if (this.buffer === undefined) delete this.buffer;
     if (this.index === undefined) delete this.index;
-  
+
     return this;
   }
 }

package/src/classic/clear.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {Device, Framebuffer, assert} from '@luma.gl/core';
@@ -18,15 +19,14 @@ const GL_DEPTH_STENCIL = 0x84f9;
 // Should disappear if asserts are removed
 const ERR_ARGUMENTS = 'clear: bad arguments';
 
-/** 
- * Optionally clears depth, color and stencil buffers 
+/**
+ * Optionally clears depth, color and stencil buffers
  * @deprecated Set clear color when creating a RenderPass.
  */
 export function clear(
-  gl: Device | WebGLRenderingContext,
+  device: Device,
   options?: {framebuffer?: Framebuffer; color?: any; depth?: any; stencil?: any}
 ): void {
-  const device = WebGLDevice.attach(gl);
   const {framebuffer = null, color = null, depth = null, stencil = null} = options || {};
   const parameters: any = {};
 
@@ -60,50 +60,55 @@ export function clear(
   assert(clearFlags !== 0, ERR_ARGUMENTS);
 
   // Temporarily set any clear "colors" and call clear
-  withGLParameters(device.gl, parameters, () => {
-    device.gl.clear(clearFlags);
+  withGLParameters(device, parameters, () => {
+    const gl = (device as WebGLDevice).gl;
+    gl.clear(clearFlags);
   });
 }
 
-/** 
- * WebGL2 - clear a specific drawing buffer 
+/**
+ * WebGL2 - clear a specific drawing buffer
  * @deprecated Set clear color when creating a RenderPass
  */
 export function clearBuffer(
-  gl: Device | WebGLRenderingContext,
+  device: Device,
   options?: {framebuffer?: Framebuffer; buffer?: any; drawBuffer?: any; value?: any}
 ) {
-  const device = WebGLDevice.attach(gl);
-
-  const {framebuffer = null, buffer = GL_COLOR, drawBuffer = 0, value = [0, 0, 0, 0]} = options || {};
-  withGLParameters(device.gl2, {framebuffer}, () => {
+  const {
+    framebuffer = null,
+    buffer = GL_COLOR,
+    drawBuffer = 0,
+    value = [0, 0, 0, 0]
+  } = options || {};
+  const gl = (device as WebGLDevice).gl;
+  withGLParameters(gl, {framebuffer}, () => {
     // Method selection per OpenGL ES 3 docs
     switch (buffer) {
       case GL_COLOR:
         switch (value.constructor) {
           case Int32Array:
-            device.gl2.clearBufferiv(buffer, drawBuffer, value);
+            gl.clearBufferiv(buffer, drawBuffer, value);
             break;
           case Uint32Array:
-            device.gl2.clearBufferuiv(buffer, drawBuffer, value);
+            gl.clearBufferuiv(buffer, drawBuffer, value);
             break;
           case Float32Array:
           default:
-            device.gl2.clearBufferfv(buffer, drawBuffer, value);
+            gl.clearBufferfv(buffer, drawBuffer, value);
         }
         break;
 
       case GL_DEPTH:
-        device.gl2.clearBufferfv(GL_DEPTH, 0, [value]);
+        gl.clearBufferfv(GL_DEPTH, 0, [value]);
         break;
 
       case GL_STENCIL:
-        device.gl2.clearBufferiv(GL_STENCIL, 0, [value]);
+        gl.clearBufferiv(GL_STENCIL, 0, [value]);
         break;
 
       case GL_DEPTH_STENCIL:
         const [depth, stencil] = value;
-        device.gl2.clearBufferfi(GL_DEPTH_STENCIL, 0, depth, stencil);
+        gl.clearBufferfi(GL_DEPTH_STENCIL, 0, depth, stencil);
         break;
 
       default:

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

@@ -1,10 +1,11 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {assert, Buffer, Texture, Framebuffer, FramebufferProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
-import {WEBGLTexture} from '../adapter/resources/webgl-texture';
+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';
@@ -66,7 +67,7 @@ export function readPixelsToArray(
   // Deduce the type from color attachment if not provided.
   sourceType =
     sourceType ||
-    (framebuffer.colorAttachments[attachment] as WEBGLTexture)?.type ||
+    (framebuffer.colorAttachments[attachment] as WEBGLTextureView)?.texture?.type ||
     GL.UNSIGNED_BYTE;
 
   // Deduce type and allocated pixelArray if needed
@@ -106,7 +107,13 @@ export function readPixelsToBuffer(
     sourceType?: number;
   }
 ): WEBGLBuffer {
-  const {target, sourceX = 0, sourceY = 0, sourceFormat = GL.RGBA, targetByteOffset = 0} = options || {};
+  const {
+    target,
+    sourceX = 0,
+    sourceY = 0,
+    sourceFormat = GL.RGBA,
+    targetByteOffset = 0
+  } = options || {};
   // following parameters are auto deduced if not provided
   let {sourceWidth, sourceHeight, sourceType} = options || {};
   const {framebuffer, deleteFramebuffer} = getFramebuffer(source);
@@ -240,8 +247,7 @@ export function copyToTexture(
         break;
       case GL.TEXTURE_2D_ARRAY:
       case GL.TEXTURE_3D:
-        device.assertWebGL2();
-        device.gl2.copyTexSubImage3D(
+        device.gl.copyTexSubImage3D(
           textureTarget,
           targetMipmaplevel,
           targetX,

package/src/classic/format-utils.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {assert} from '@luma.gl/core';