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

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

@@ -16,7 +16,7 @@ import { WEBGLTextureView } from "./webgl-texture-view.js";
 // import type {WebGLSetTextureOptions, WebGLCopyTextureOptions} from '../helpers/webgl-texture-utils';
 import { initializeTextureStorage, 
 // clearMipLevel,
-copyCPUImageToMipLevel, copyCPUDataToMipLevel, 
+copyExternalImageToMipLevel, copyCPUDataToMipLevel, 
 // copyGPUBufferToMipLevel,
 getWebGLTextureTarget } from "../helpers/webgl-texture-utils.js";
 // PORTABLE HELPERS (Move to methods on Texture?)
@@ -125,7 +125,7 @@ export class WEBGLTexture extends Texture {
         // const {parameters = {}  as Record<GL, any>} = props;
         let { width, height } = props;
         if (!width || !height) {
-            const textureSize = this.getTextureDataSize(data);
+            const textureSize = Texture.getTextureDataSize(data);
             width = textureSize?.width || 1;
             height = textureSize?.height || 1;
         }
@@ -263,11 +263,40 @@ export class WEBGLTexture extends Texture {
         this.gl.bindTexture(this.glTarget, null);
     }
     // Image Data Setters
+    copyExternalImage(options) {
+        const size = Texture.getExternalImageSize(options.image);
+        const opts = { ...Texture.defaultCopyExternalImageOptions, ...size, ...options };
+        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 };
+    }
     setTexture1DData(data) {
         throw new Error('setTexture1DData not supported in WebGL.');
     }
     /** Set a simple texture */
-    setTexture2DData(lodData, depth = 0, glTarget = this.glTarget) {
+    setTexture2DData(lodData, depth = 0) {
         this.bind();
         const lodArray = normalizeTextureData(lodData, this);
         // If the user provides multiple LODs, then automatic mipmap
@@ -290,7 +319,9 @@ export class WEBGLTexture extends Texture {
             throw new Error(this.id);
         }
         if (ArrayBuffer.isView(data)) {
+            this.bind();
             copyCPUDataToMipLevel(this.device.gl, data, this);
+            this.unbind();
         }
     }
     /**
@@ -303,9 +334,9 @@ export class WEBGLTexture extends Texture {
         if (this.props.dimension !== 'cube') {
             throw new Error(this.id);
         }
-        // for (const face of Texture.CubeFaces) {
-        //   // this.setTextureCubeFaceData(face, data[face]);
-        // }
+        for (const face of Texture.CubeFaces) {
+            this.setTextureCubeFaceData(data[face], face);
+        }
     }
     /**
      * Sets an entire texture array
@@ -331,26 +362,8 @@ export class WEBGLTexture extends Texture {
         if (Array.isArray(lodData) && lodData.length > 1 && this.props.mipmaps !== false) {
             log.warn(`${this.id} has mipmap and multiple LODs.`)();
         }
-        // const glFace = GL.TEXTURE_CUBE_MAP_POSITIVE_X + Texture.CubeFaces.indexOf(face);
-        // const glType = GL.UNSIGNED_BYTE;
-        // const {width, height, format = GL.RGBA, type = GL.UNSIGNED_BYTE} = this;
-        // const {width, height, format = GL.RGBA, type = GL.UNSIGNED_BYTE} = this;
-        this.bind();
-        // for (let lodLevel = 0; lodLevel < lodData.length; lodLevel++) {
-        //   const imageData = lodData[lodLevel];
-        //   if (imageData instanceof ArrayBuffer) {
-        //     // const imageData = image instanceof ArrayBuffer ? new ImageData(new Uint8ClampedArray(image), this.width) : image;
-        //     this.device.gl.texImage2D?.(
-        //       glFace,
-        //       lodLevel,
-        //       this.glInternalFormat,
-        //       this.glInternalFormat,
-        //       glType,
-        //       imageData
-        //     );
-        //   }
-        // }
-        this.unbind();
+        const faceDepth = Texture.CubeFaces.indexOf(face);
+        this.setTexture2DData(lodData, faceDepth);
     }
     // INTERNAL METHODS
     /** @todo update this method to accept LODs */
@@ -482,21 +495,27 @@ export class WEBGLTexture extends Texture {
      * Copy a region of data from a CPU memory buffer into this texture.
      * @todo -   GLUnpackParameters parameters
      */
-    _setMipLevel(depth, level, textureData, offset = 0) {
+    _setMipLevel(depth, mipLevel, textureData, glTarget = this.glTarget) {
         // if (!textureData) {
         //   clearMipLevel(this.device.gl, {...this, depth, level});
         //   return;
         // }
         if (Texture.isExternalImage(textureData)) {
-            copyCPUImageToMipLevel(this.device.gl, textureData, { ...this, depth, level });
+            copyExternalImageToMipLevel(this.device.gl, this.handle, textureData, {
+                ...this,
+                depth,
+                mipLevel,
+                glTarget
+            });
             return;
         }
         // @ts-expect-error
-        if (this.isTextureLevelData(textureData)) {
+        if (Texture.isTextureLevelData(textureData)) {
             copyCPUDataToMipLevel(this.device.gl, textureData.data, {
                 ...this,
                 depth,
-                level
+                mipLevel,
+                glTarget
             });
             return;
         }

package/dist/adapter/resources/webgl-transform-feedback.js

@@ -45,7 +45,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     }
     end() {
         this.gl.endTransformFeedback();
-        if (!this.bindOnUse) {
+        if (this.bindOnUse) {
             this._unbindBuffers();
         }
         this.gl.bindTransformFeedback(36386, null);

package/dist/adapter/resources/webgl-vertex-array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-vertex-array.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-vertex-array.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAe,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,WAAW,EAAkB,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAM5C,gCAAgC;AAChC,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IAExC,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAQ;IAE3B,6EAA6E;IAC7E,MAAM,CAAC,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;gBAKpD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAM/C,OAAO,IAAI,IAAI;IAexB;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAgBhD,gGAAgG;IAChG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IAgC1D,2FAA2F;IAClF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAK3D,gBAAgB,IAAI,IAAI;IAKxB,iBAAiB,IAAI,IAAI;IAOlC;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAU1C;;;OAGG;IAcH,gCAAgC;IAChC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;IAsBvC;;;;;OAKG;IACH,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAO,GAAG,IAAI;IAiBxD;;;;;OAKG;IACH,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM;CA8BnE"}
+{"version":3,"file":"webgl-vertex-array.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-vertex-array.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAe,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,WAAW,EAAkB,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAM5C,gCAAgC;AAChC,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IAExC,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAQ;IAE3B,6EAA6E;IAC7E,MAAM,CAAC,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;gBAKpD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAM/C,OAAO,IAAI,IAAI;IAexB;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAgBhD,gGAAgG;IAChG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IAmC1D,2FAA2F;IAClF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAK3D,gBAAgB,IAAI,IAAI;IAKxB,iBAAiB,IAAI,IAAI;IAOlC;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAU1C;;;OAGG;IAcH,gCAAgC;IAChC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;IAsBvC;;;;;OAKG;IACH,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAO,GAAG,IAAI;IAiBxD;;;;;OAKG;IACH,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM;CA8BnE"}

package/dist/adapter/resources/webgl-vertex-array.js

@@ -77,6 +77,9 @@ export class WEBGLVertexArray extends VertexArray {
             // Attaches ARRAY_BUFFER with specified buffer format to location
             this.device.gl.vertexAttribPointer(location, size, type, normalized, stride, offset);
         }
+        // Clear binding - keeping it may cause [.WebGL-0x12804417100]
+        // GL_INVALID_OPERATION: A transform feedback buffer that would be written to is also bound to a non-transform-feedback target
+        this.device.gl.bindBuffer(34962, null);
         // Mark as non-constant
         this.device.gl.enableVertexAttribArray(location);
         // Set the step mode 0=vertex, 1=instance

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

@@ -0,0 +1,21 @@
+import { Adapter, Device, DeviceProps } from '@luma.gl/core';
+import { WebGLDevice } from "./webgl-device.js";
+export declare class WebGLAdapter extends Adapter {
+    /** type of device's created by this adapter */
+    readonly type: Device['type'];
+    constructor();
+    /** Check if WebGL 2 is available */
+    isSupported(): boolean;
+    /** Force any created WebGL contexts to be WebGL2 contexts, polyfilled with WebGL1 extensions */
+    enforceWebGL2(enable: boolean): void;
+    /**
+     * Get a device instance from a GL context
+     * Creates and instruments the device if not already created
+     * @param gl
+     * @returns
+     */
+    attach(gl: Device | WebGL2RenderingContext): Promise<WebGLDevice>;
+    create(props?: DeviceProps): Promise<WebGLDevice>;
+}
+export declare const webgl2Adapter: WebGLAdapter;
+//# sourceMappingURL=webgl-adapter.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/webgl-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAO3C,qBAAa,YAAa,SAAQ,OAAO;IACvC,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAW;;IAYxC,oCAAoC;IACpC,WAAW,IAAI,OAAO;IAItB,gGAAgG;IAChG,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAIpC;;;;;OAKG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,sBAAsB,GAAG,OAAO,CAAC,WAAW,CAAC;IAejE,MAAM,CAAC,KAAK,GAAE,WAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;CA4C5D;AAWD,eAAO,MAAM,aAAa,cAAqB,CAAC"}

package/dist/adapter/webgl-adapter.js

@@ -0,0 +1,91 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { Adapter, Device, CanvasContext, log } from '@luma.gl/core';
+import { WebGLDevice } from "./webgl-device.js";
+import { enforceWebGL2 } from "../context/polyfills/polyfill-webgl1-extensions.js";
+import { loadSpectorJS, DEFAULT_SPECTOR_PROPS } from "../context/debug/spector.js";
+import { loadWebGLDeveloperTools } from "../context/debug/webgl-developer-tools.js";
+const LOG_LEVEL = 1;
+export class WebGLAdapter extends Adapter {
+    /** type of device's created by this adapter */
+    type = 'webgl';
+    constructor() {
+        super();
+        // Add spector default props to device default props, so that runtime settings are observed
+        Device.defaultProps = { ...Device.defaultProps, ...DEFAULT_SPECTOR_PROPS };
+        // @ts-ignore DEPRECATED For backwards compatibility luma.registerDevices
+        WebGLDevice.adapter = this;
+    }
+    /** Check if WebGL 2 is available */
+    isSupported() {
+        return typeof WebGL2RenderingContext !== 'undefined';
+    }
+    /** Force any created WebGL contexts to be WebGL2 contexts, polyfilled with WebGL1 extensions */
+    enforceWebGL2(enable) {
+        enforceWebGL2(enable);
+    }
+    /**
+     * Get a device instance from a GL context
+     * Creates and instruments the device if not already created
+     * @param gl
+     * @returns
+     */
+    async attach(gl) {
+        if (gl instanceof WebGLDevice) {
+            return gl;
+        }
+        // @ts-expect-error
+        if (gl?.device instanceof Device) {
+            // @ts-expect-error
+            return gl.device;
+        }
+        if (!isWebGL(gl)) {
+            throw new Error('Invalid WebGL2RenderingContext');
+        }
+        return new WebGLDevice({ gl: gl });
+    }
+    async create(props = {}) {
+        log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
+        const promises = [];
+        // Load webgl and spector debug scripts from CDN if requested
+        if (props.debug) {
+            promises.push(loadWebGLDeveloperTools());
+        }
+        if (props.debugWithSpectorJS) {
+            promises.push(loadSpectorJS(props));
+        }
+        // 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.
+        const results = await Promise.allSettled(promises);
+        for (const result of results) {
+            if (result.status === 'rejected') {
+                log.error(`Failed to initialize debug libraries ${result.reason}`)();
+            }
+        }
+        log.probe(LOG_LEVEL + 1, 'DOM is loaded')();
+        const device = new WebGLDevice(props);
+        // Log some debug info about the newly created context
+        const message = `\
+Created ${device.type}${device.debug ? ' debug' : ''} context: \
+${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContext.id}`;
+        log.probe(LOG_LEVEL, message)();
+        log.table(LOG_LEVEL, device.info)();
+        log.groupEnd(LOG_LEVEL)();
+        return device;
+    }
+}
+/** Check if supplied parameter is a WebGL2RenderingContext */
+function isWebGL(gl) {
+    if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
+        return true;
+    }
+    // Look for debug contexts, headless gl etc
+    return Boolean(gl && Number.isFinite(gl._version));
+}
+export const webgl2Adapter = new WebGLAdapter();

package/dist/adapter/webgl-device.d.ts

@@ -1,11 +1,11 @@
 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 } from '@luma.gl/core';
 import type { GLExtensions } from '@luma.gl/constants';
 import { WebGLDeviceFeatures } from "./device-helpers/webgl-device-features.js";
 import { WebGLDeviceLimits } from "./device-helpers/webgl-device-limits.js";
 import { WebGLCanvasContext } from "./webgl-canvas-context.js";
+import type { Spector } from "../context/debug/spector-types.js";
 import type { BufferProps, ShaderProps, SamplerProps, TextureProps, ExternalTexture, ExternalTextureProps, FramebufferProps, RenderPipelineProps, ComputePipeline, ComputePipelineProps, RenderPassProps, ComputePass, ComputePassProps, CommandEncoderProps, TransformFeedbackProps, QuerySetProps } from '@luma.gl/core';
 import { WEBGLBuffer } from "./resources/webgl-buffer.js";
 import { WEBGLShader } from "./resources/webgl-shader.js";
@@ -18,8 +18,6 @@ import { WEBGLTransformFeedback } from "./resources/webgl-transform-feedback.js"
 import { WEBGLQuerySet } from "./resources/webgl-query-set.js";
 /** WebGPU style Device API for a WebGL context */
 export declare class WebGLDevice extends Device {
-    /** type of this device */
-    static readonly type: string;
     /** type of this device */
     readonly type = "webgl";
     /** The underlying WebGL context */
@@ -33,16 +31,20 @@ export declare class WebGLDevice extends Device {
         message: string;
     }>;
     private _resolveContextLost?;
-    /** Check if WebGL 2 is available */
-    static isSupported(): boolean;
-    /**
-     * Get a device instance from a GL context
-     * Creates and instruments the device if not already created
-     * @param gl
-     * @returns
-     */
-    static attach(gl: Device | WebGL2RenderingContext): WebGLDevice;
-    static create(props?: DeviceProps): Promise<WebGLDevice>;
+    /** WebGL2 context. */
+    readonly gl: WebGL2RenderingContext;
+    readonly debug: boolean;
+    /** State used by luma.gl classes: TODO - move to canvasContext*/
+    readonly _canvasSizeInfo: {
+        clientWidth: number;
+        clientHeight: number;
+        devicePixelRatio: number;
+    };
+    /** State used by luma.gl classes - TODO - not used? */
+    readonly _extensions: GLExtensions;
+    _polyfilled: boolean;
+    /** Instance of Spector.js (if initialized) */
+    spectorJS: Spector;
     constructor(props: DeviceProps);
     /**
      * Destroys the context
@@ -50,7 +52,6 @@ export declare class WebGLDevice extends Device {
      */
     destroy(): void;
     get isLost(): boolean;
-    getSize(): [number, number];
     isTextureFormatSupported(format: TextureFormat): boolean;
     isTextureFormatFilterable(format: TextureFormat): boolean;
     isTextureFormatRenderable(format: TextureFormat): boolean;
@@ -108,20 +109,6 @@ export declare class WebGLDevice extends Device {
         stencil?: any;
     }): void;
     resetWebGL(): void;
-    /** WebGL2 context. */
-    readonly gl: WebGL2RenderingContext;
-    readonly debug: boolean;
-    /** State used by luma.gl classes: TODO - move to canvasContext*/
-    readonly _canvasSizeInfo: {
-        clientWidth: number;
-        clientHeight: number;
-        devicePixelRatio: number;
-    };
-    /** State used by luma.gl classes - TODO - not used? */
-    readonly _extensions: GLExtensions;
-    _polyfilled: boolean;
-    /** Instance of Spector.js (if initialized) */
-    spectorJS: unknown;
     /**
      * Triggers device (or WebGL context) loss.
      * @note primarily intended for testing how application reacts to device loss

package/dist/adapter/webgl-device.d.ts.map

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

package/dist/adapter/webgl-device.js

@@ -1,16 +1,17 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Device, CanvasContext, log } from '@luma.gl/core';
-import { popContextState, pushContextState, trackContextState } from "../context/state-tracker/track-context-state.js";
+import { Device, log } from '@luma.gl/core';
+import { WebGLStateTracker } from "../context/state-tracker/webgl-state-tracker.js";
 import { createBrowserContext } from "../context/helpers/create-browser-context.js";
 import { getDeviceInfo } from "./device-helpers/webgl-device-info.js";
 import { WebGLDeviceFeatures } from "./device-helpers/webgl-device-features.js";
 import { WebGLDeviceLimits } from "./device-helpers/webgl-device-limits.js";
 import { WebGLCanvasContext } from "./webgl-canvas-context.js";
-import { loadSpectorJS, initializeSpectorJS } from "../context/debug/spector.js";
-import { loadWebGLDeveloperTools, makeDebugContext } from "../context/debug/webgl-developer-tools.js";
+import { initializeSpectorJS } from "../context/debug/spector.js";
+import { makeDebugContext } from "../context/debug/webgl-developer-tools.js";
 import { isTextureFormatSupported, isTextureFormatRenderable, isTextureFormatFilterable } from "./converters/texture-formats.js";
+import { uid } from "../utils/uid.js";
 import { WEBGLBuffer } from "./resources/webgl-buffer.js";
 import { WEBGLShader } from "./resources/webgl-shader.js";
 import { WEBGLSampler } from "./resources/webgl-sampler.js";
@@ -22,20 +23,17 @@ import { WEBGLCommandEncoder } from "./resources/webgl-command-encoder.js";
 import { WEBGLVertexArray } from "./resources/webgl-vertex-array.js";
 import { WEBGLTransformFeedback } from "./resources/webgl-transform-feedback.js";
 import { WEBGLQuerySet } from "./resources/webgl-query-set.js";
-import { readPixelsToArray, readPixelsToBuffer } from "../classic/copy-and-blit.js";
+import { readPixelsToArray, readPixelsToBuffer } from "./helpers/webgl-texture-utils.js";
 import { setGLParameters, getGLParameters, resetGLParameters } from "../context/parameters/unified-parameter-api.js";
 import { withGLParameters } from "../context/state-tracker/with-parameters.js";
-import { clear } from "../classic/clear.js";
+import { clear } from "../deprecated/clear.js";
 import { getWebGLExtension } from "../context/helpers/webgl-extensions.js";
-const LOG_LEVEL = 1;
 /** WebGPU style Device API for a WebGL context */
 export class WebGLDevice extends Device {
     //
     // Public `Device` API
     //
     /** type of this device */
-    static type = 'webgl';
-    /** type of this device */
     type = 'webgl';
     /** The underlying WebGL context */
     handle;
@@ -45,77 +43,21 @@ export class WebGLDevice extends Device {
     canvasContext;
     lost;
     _resolveContextLost;
-    //
-    // Static methods, expected to be present by `luma.createDevice()`
-    //
-    /** Check if WebGL 2 is available */
-    static isSupported() {
-        return typeof WebGL2RenderingContext !== 'undefined';
-    }
-    /**
-     * Get a device instance from a GL context
-     * Creates and instruments the device if not already created
-     * @param gl
-     * @returns
-     */
-    static attach(gl) {
-        if (gl instanceof WebGLDevice) {
-            return gl;
-        }
-        // @ts-expect-error
-        if (gl?.device instanceof Device) {
-            // @ts-expect-error
-            return gl.device;
-        }
-        if (!isWebGL(gl)) {
-            throw new Error('Invalid WebGL2RenderingContext');
-        }
-        return new WebGLDevice({ gl: gl });
-    }
-    static async create(props = {}) {
-        log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
-        const promises = [];
-        // Load webgl and spector debug scripts from CDN if requested
-        if (props.debug) {
-            promises.push(loadWebGLDeveloperTools());
-        }
-        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.
-        const results = await Promise.allSettled(promises);
-        for (const result of results) {
-            if (result.status === 'rejected') {
-                log.error(`Failed to initialize debug libraries ${result.reason}`)();
-            }
-        }
-        log.probe(LOG_LEVEL + 1, 'DOM is loaded')();
-        // @ts-expect-error
-        if (props.gl?.device) {
-            log.warn('reattaching existing device')();
-            return WebGLDevice.attach(props.gl);
-        }
-        const device = new WebGLDevice(props);
-        // Log some debug info about the newly created context
-        const message = `\
-Created ${device.type}${device.debug ? ' debug' : ''} context: \
-${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContext.id}`;
-        log.probe(LOG_LEVEL, message)();
-        log.table(LOG_LEVEL, device.info)();
-        log.groupEnd(LOG_LEVEL)();
-        return device;
-    }
+    /** WebGL2 context. */
+    gl;
+    debug = false;
+    /** State used by luma.gl classes: TODO - move to canvasContext*/
+    _canvasSizeInfo = { clientWidth: 0, clientHeight: 0, devicePixelRatio: 1 };
+    /** State used by luma.gl classes - TODO - not used? */
+    _extensions = {};
+    _polyfilled = false;
+    /** Instance of Spector.js (if initialized) */
+    spectorJS;
     //
     // Public API
     //
     constructor(props) {
-        super({ ...props, id: props.id || 'webgl-device' });
+        super({ ...props, id: props.id || uid('webgl-device') });
         // If attaching to an already attached context, return the attached device
         // @ts-expect-error device is attached to context
         const device = props.gl?.device;
@@ -128,22 +70,25 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         this.lost = new Promise(resolve => {
             this._resolveContextLost = resolve;
         });
-        let gl = props.gl || null;
-        gl ||= createBrowserContext(this.canvasContext.canvas, {
+        this.handle = createBrowserContext(this.canvasContext.canvas, {
             ...props,
             onContextLost: (event) => this._resolveContextLost?.({
                 reason: 'destroyed',
                 message: 'Entered sleep mode, or too many apps or browser tabs are using the GPU.'
             })
         });
-        if (!gl) {
+        this.gl = this.handle;
+        if (!this.handle) {
             throw new Error('WebGL context creation failed');
         }
-        this.handle = gl;
-        this.gl = gl;
+        // Add spector debug instrumentation to context
+        // We need to trust spector integration to decide if spector should be initialized
+        // We also run spector instrumentation first, otherwise spector can clobber luma instrumentation.
+        this.spectorJS = initializeSpectorJS({ ...this.props, gl: this.handle });
+        // Instrument context
         this.gl.device = this; // Update GL context: Link webgl context back to device
         this.gl._version = 2; // Update GL context: Store WebGL version field on gl context (HACK to identify debug contexts)
-        // luma Device fields
+        // initialize luma Device fields
         this.info = getDeviceInfo(this.gl, this._extensions);
         this.limits = new WebGLDeviceLimits(this.gl);
         this.features = new WebGLDeviceFeatures(this.gl, this._extensions, this.props.disabledFeatures);
@@ -152,23 +97,17 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         }
         this.canvasContext.resize();
         // Install context state tracking
-        // @ts-expect-error - hidden parameters
-        const { enable = true, copyState = false } = props;
-        trackContextState(this.gl, {
-            enable,
-            copyState,
+        const glState = new WebGLStateTracker(this.gl, {
             log: (...args) => log.log(1, ...args)()
         });
-        // DEBUG contexts: Add debug instrumentation to the context, force log level to at least 1
+        glState.trackState(this.gl, { copyState: false });
+        // DEBUG contexts: Add luma debug instrumentation to the context, force log level to at least 1
         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.')();
         }
-        if (props.spector) {
-            this.spectorJS = initializeSpectorJS({ ...this.props, canvas: this.handle.canvas });
-        }
     }
     /**
      * Destroys the context
@@ -178,9 +117,6 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     get isLost() {
         return this.gl.isContextLost();
     }
-    getSize() {
-        return [this.gl.drawingBufferWidth, this.gl.drawingBufferHeight];
-    }
     isTextureFormatSupported(format) {
         return isTextureFormatSupported(this.gl, format, this._extensions);
     }
@@ -279,16 +215,6 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     //
     // WebGL-only API (not part of `Device` API)
     //
-    /** WebGL2 context. */
-    gl;
-    debug = false;
-    /** State used by luma.gl classes: TODO - move to canvasContext*/
-    _canvasSizeInfo = { clientWidth: 0, clientHeight: 0, devicePixelRatio: 1 };
-    /** State used by luma.gl classes - TODO - not used? */
-    _extensions = {};
-    _polyfilled = false;
-    /** Instance of Spector.js (if initialized) */
-    spectorJS;
     /**
      * Triggers device (or WebGL context) loss.
      * @note primarily intended for testing how application reacts to device loss
@@ -310,11 +236,13 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     }
     /** Save current WebGL context state onto an internal stack */
     pushState() {
-        pushContextState(this.gl);
+        const webglState = WebGLStateTracker.get(this.gl);
+        webglState.push();
     }
     /** Restores previously saved context state */
     popState() {
-        popContextState(this.gl);
+        const webglState = WebGLStateTracker.get(this.gl);
+        webglState.pop();
     }
     /**
      * Storing data on a special field on WebGLObjects makes that data visible in SPECTOR chrome debug extension
@@ -379,14 +307,6 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         return this._extensions;
     }
 }
-/** Check if supplied parameter is a WebGL2RenderingContext */
-function isWebGL(gl) {
-    if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
-        return true;
-    }
-    // Look for debug contexts, headless gl etc
-    return Boolean(gl && Number.isFinite(gl._version));
-}
 /** Set constant float array attribute */
 function setConstantFloatArray(device, location, array) {
     switch (array.length) {