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

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

@@ -1,4 +1,5 @@
-import type { Device, Buffer, VertexArrayProps, TypedArray } from '@luma.gl/core';
+import type { TypedArray } from '@math.gl/types';
+import type { Device, Buffer, VertexArrayProps } from '@luma.gl/core';
 import { VertexArray } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { WebGLDevice } from "../webgl-device.js";
@@ -12,7 +13,7 @@ export declare class WEBGLVertexArray extends VertexArray {
     private bufferValue;
     /** * Attribute 0 can not be disable on most desktop OpenGL based browsers */
     static isConstantAttributeZeroSupported(device: Device): boolean;
-    constructor(device: WebGLDevice, props?: VertexArrayProps);
+    constructor(device: WebGLDevice, props: VertexArrayProps);
     destroy(): void;
     /**
     // Set (bind/unbind) an elements buffer, for indexed rendering.

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,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAC,WAAW,EAA6B,MAAM,eAAe,CAAC;AACtE,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,CAAC,EAAE,gBAAgB;IAMhD,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"}
+{"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

@@ -1,11 +1,11 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VertexArray, getScratchArray, fillArray } from '@luma.gl/core';
+import { VertexArray, getScratchArray } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { getBrowser } from '@probe.gl/env';
 import { getGLFromVertexType } from "../converters/vertex-formats.js";
-// import {getGLFromVertexType} from '../converters/vertex-formats';
+import { fillArray } from "../../utils/fill-array.js";
 /** VertexArrayObject wrapper */
 export class WEBGLVertexArray extends VertexArray {
     get [Symbol.toStringTag]() {

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-canvas-context.d.ts

@@ -1,4 +1,4 @@
-import type { CanvasContextProps } from '@luma.gl/core';
+import type { CanvasContextProps, TextureFormat } from '@luma.gl/core';
 import { CanvasContext } from '@luma.gl/core';
 import { WebGLDevice } from "./webgl-device.js";
 import { WEBGLFramebuffer } from "./resources/webgl-framebuffer.js";
@@ -7,6 +7,8 @@ import { WEBGLFramebuffer } from "./resources/webgl-framebuffer.js";
  */
 export declare class WebGLCanvasContext extends CanvasContext {
     readonly device: WebGLDevice;
+    readonly format: TextureFormat;
+    readonly depthStencilFormat: TextureFormat;
     presentationSize: [number, number];
     private _framebuffer;
     constructor(device: WebGLDevice, props: CanvasContextProps);

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-canvas-context.d.ts","sourceRoot":"","sources":["../../src/adapter/webgl-canvas-context.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAC3C,OAAO,EAAC,gBAAgB,EAAC,yCAAsC;AAE/D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,YAAY,CAAiC;gBAEzC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB;IAS1D,qBAAqB,IAAI,gBAAgB;IAOzC,sDAAsD;IACtD,MAAM;IAUN;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAC,GAAG,IAAI;IAW7F,MAAM;CAOP"}
+{"version":3,"file":"webgl-canvas-context.d.ts","sourceRoot":"","sources":["../../src/adapter/webgl-canvas-context.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACrE,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAC3C,OAAO,EAAC,gBAAgB,EAAC,yCAAsC;AAE/D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAgB;IAC9C,QAAQ,CAAC,kBAAkB,EAAE,aAAa,CAAiB;IAE3D,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,YAAY,CAAiC;gBAEzC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB;IAS1D,qBAAqB,IAAI,gBAAgB;IAOzC,sDAAsD;IACtD,MAAM;IAUN;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAC,GAAG,IAAI;IAW7F,MAAM;CAOP"}

package/dist/adapter/webgl-canvas-context.js

@@ -8,6 +8,8 @@ import { WEBGLFramebuffer } from "./resources/webgl-framebuffer.js";
  */
 export class WebGLCanvasContext extends CanvasContext {
     device;
+    format = 'rgba8unorm';
+    depthStencilFormat = 'depth24plus';
     presentationSize;
     _framebuffer = null;
     constructor(device, props) {

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

@@ -1,14 +1,16 @@
-import type { DeviceProps, DeviceInfo, CanvasContextProps, TextureFormat, VertexArray, VertexArrayProps, Framebuffer, Buffer, Texture, TypedArray } from '@luma.gl/core';
+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 { 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";
 import { WEBGLSampler } from "./resources/webgl-sampler.js";
-import { WEBGLTexture } from "./resources/webgl-texture.js";
 import { WEBGLFramebuffer } from "./resources/webgl-framebuffer.js";
 import { WEBGLRenderPass } from "./resources/webgl-render-pass.js";
 import { WEBGLRenderPipeline } from "./resources/webgl-render-pipeline.js";
@@ -17,8 +19,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 */
@@ -32,16 +32,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
@@ -49,13 +53,12 @@ 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;
     createCanvasContext(props?: CanvasContextProps): CanvasContext;
     createBuffer(props: BufferProps | ArrayBuffer | ArrayBufferView): WEBGLBuffer;
-    _createTexture(props: TextureProps): WEBGLTexture;
+    _createTexture(props: TextureProps): Texture;
     createExternalTexture(props: ExternalTextureProps): ExternalTexture;
     createSampler(props: SamplerProps): WEBGLSampler;
     createShader(props: ShaderProps): WEBGLShader;
@@ -107,20 +110,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, uid, assert } 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";
@@ -27,15 +28,12 @@ import { setGLParameters, getGLParameters, resetGLParameters } from "../context/
 import { withGLParameters } from "../context/state-tracker/with-parameters.js";
 import { clear } from "../classic/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,72 +43,16 @@ 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
     //
@@ -128,25 +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)
-        if (props.spector) {
-            this.spectorJS = initializeSpectorJS({ ...this.props, canvas: this.handle.canvas });
-        }
-        // 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);
@@ -155,14 +97,11 @@ ${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;
@@ -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);
     }
@@ -198,6 +134,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         const newProps = this._getBufferProps(props);
         return new WEBGLBuffer(this, newProps);
     }
+    // _createTexture(props: TextureProps): WEBGLTexture {
     _createTexture(props) {
         return new WEBGLTexture(this, props);
     }
@@ -235,7 +172,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         throw new Error('ComputePass not supported in WebGL');
     }
     renderPass = null;
-    createCommandEncoder(props) {
+    createCommandEncoder(props = {}) {
         return new WEBGLCommandEncoder(this, props);
     }
     /**
@@ -278,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
@@ -309,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
@@ -369,7 +298,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
                 setConstantUintArray(this, location, constant);
                 break;
             default:
-                assert(false);
+                throw new Error('constant');
         }
     }
     /** Ensure extensions are only requested once */
@@ -378,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) {
@@ -402,7 +323,7 @@ function setConstantFloatArray(device, location, array) {
             device.gl.vertexAttrib4fv(location, array);
             break;
         default:
-            assert(false);
+        // assert(false);
     }
 }
 /** Set constant signed int array attribute */

package/dist/classic/accessor.d.ts

@@ -1,5 +1,26 @@
-import { Buffer, AccessorObject } from '@luma.gl/core';
+import { Buffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
+/**
+ * Attribute descriptor object
+ * @deprecated Use ShaderLayout
+ */
+export interface AccessorObject {
+    buffer?: Buffer;
+    offset?: number;
+    stride?: number;
+    /** @deprecated - Use accessor.stepMode */
+    divisor?: number;
+    /** @deprecated - Infer from format */
+    type?: number;
+    /** @deprecated - Infer from format */
+    size?: number;
+    /** @deprecated - Infer from format */
+    normalized?: boolean;
+    /** @deprecated - Infer from format */
+    integer?: boolean;
+    /** @deprecated */
+    index?: number;
+}
 declare const DEFAULT_ACCESSOR_VALUES: {
     offset: number;
     stride: number;

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

@@ -1 +1 @@
-{"version":3,"file":"accessor.d.ts","sourceRoot":"","sources":["../../src/classic/accessor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqB,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC,QAAA,MAAM,uBAAuB;;;;;;;;CAQ5B,CAAC;AASF,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;CA6E1C;AAGD,OAAO,EAAC,uBAAuB,EAAC,CAAC"}
+{"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/accessor.js

@@ -1,7 +1,6 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { assert, checkProps } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { getTypedArrayFromGLType } from "./typed-array-utils.js";
 const DEFAULT_ACCESSOR_VALUES = {
@@ -13,12 +12,6 @@ const DEFAULT_ACCESSOR_VALUES = {
     normalized: false,
     integer: false
 };
-const PROP_CHECKS = {
-    deprecatedProps: {
-        instanced: 'divisor',
-        isInstanced: 'divisor'
-    }
-};
 export class Accessor {
     offset;
     stride;
@@ -36,7 +29,7 @@ export class Accessor {
         return ArrayType.BYTES_PER_ELEMENT;
     }
     static getBytesPerVertex(accessor) {
-        assert(accessor.size);
+        // assert(accessor.size);
         // TODO: using `FLOAT` when type is not specified,
         // ensure this assumption is valid or force API to specify type.
         const ArrayType = getTypedArrayFromGLType(accessor.type || 5126);
@@ -67,7 +60,6 @@ export class Accessor {
     // PRIVATE
     // eslint-disable-next-line complexity, max-statements
     _assign(props = {}) {
-        props = checkProps('Accessor', props, PROP_CHECKS);
         if (props.type !== undefined) {
             this.type = props.type;
             // Auto-deduce integer type?