@luma.gl/webgl 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/adapter/webgl-device.js

@@ -1,58 +1,57 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Device, CanvasContext, log, uid, assert } from '@luma.gl/core';
-import { isBrowser } from '@probe.gl/env';
-import { popContextState, pushContextState, trackContextState } from '../context/state-tracker/track-context-state';
-import { createBrowserContext } from '../context/context/create-browser-context';
-import { getDeviceInfo } from './device-helpers/webgl-device-info';
-import { getDeviceFeatures } from './device-helpers/webgl-device-features';
-import { getDeviceLimits, getWebGLLimits } 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';
-import { isTextureFormatSupported, isTextureFormatRenderable, isTextureFormatFilterable } from './converters/texture-formats';
-import { WEBGLBuffer } from './resources/webgl-buffer';
-import { WEBGLShader } from './resources/webgl-shader';
-import { WEBGLSampler } from './resources/webgl-sampler';
-import { WEBGLTexture } from './resources/webgl-texture';
-import { WEBGLFramebuffer } from './resources/webgl-framebuffer';
-import { WEBGLRenderPass } from './resources/webgl-render-pass';
-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 { 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 { popContextState, pushContextState, trackContextState } from "../context/state-tracker/track-context-state.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 { isTextureFormatSupported, isTextureFormatRenderable, isTextureFormatFilterable } from "./converters/texture-formats.js";
+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";
+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 { setGLParameters, getGLParameters } from "../context/parameters/unified-parameter-api.js";
+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';
-    static isSupported() {
-        return typeof WebGL2RenderingContext !== 'undefined';
-    }
+    /** type of this device */
+    type = 'webgl';
+    /** The underlying WebGL context */
+    handle;
+    features;
+    limits;
     info;
     canvasContext;
-    handle;
-    get features() {
-        this._features = this._features || getDeviceFeatures(this.gl);
-        return this._features;
-    }
-    get limits() {
-        this._limits = this._limits || getDeviceLimits(this.gl);
-        return this._limits;
-    }
     lost;
     _resolveContextLost;
-    _features;
-    _limits;
     //
     // 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
@@ -75,29 +74,37 @@ export class WebGLDevice extends Device {
     }
     static async create(props = {}) {
         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 = [];
         // Load webgl and spector debug scripts from CDN if requested
-        if (log.get('debug') || props.debug) {
-            await loadWebGLDeveloperTools();
+        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);
         }
-        // @ts-expect-error spector not on props
-        const { spector } = props;
-        if (log.get('spector') || spector) {
-            await loadSpectorJS();
+        // 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 && props.gl.device) {
+        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.info.type}${device.debug ? ' debug' : ''} context: \
+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)();
@@ -116,33 +123,34 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
             throw new Error(`WebGL context already attached to device ${device.id}`);
         }
         // 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(resolve => {
             this._resolveContextLost = resolve;
         });
-        const onContextLost = (event) => this._resolveContextLost?.({
-            reason: 'destroyed',
-            message: 'Computer entered sleep mode, or too many apps or browser tabs are using the GPU.'
-        });
         let gl = props.gl || null;
-        gl =
-            gl ||
-                (isBrowser()
-                    ? createBrowserContext(this.canvasContext.canvas, { ...props, onContextLost })
-                    : null);
+        gl ||= 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) {
             throw new Error('WebGL context creation failed');
         }
         this.handle = gl;
-        this.gl = this.handle;
-        this.canvasContext.resize();
+        this.gl = gl;
+        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
-        this.info = getDeviceInfo(this.gl);
-        // @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;
+        this.info = getDeviceInfo(this.gl, this._extensions);
+        this.limits = new WebGLDeviceLimits(this.gl);
+        this.features = new WebGLDeviceFeatures(this.gl, this._extensions, this.props.disabledFeatures);
+        if (this.props.initalizeFeatures) {
+            this.features.initializeFeatures();
+        }
+        this.canvasContext.resize();
         // Install context state tracking
         // @ts-expect-error - hidden parameters
         const { enable = true, copyState = false } = props;
@@ -152,24 +160,21 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
             log: (...args) => log.log(1, ...args)()
         });
         // DEBUG contexts: Add debug instrumentation to the context, force log level to at least 1
-        if (isBrowser() && props.debug) {
+        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;
-            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() {
-    }
+    destroy() { }
     get isLost() {
         return this.gl.isContextLost();
     }
@@ -177,13 +182,13 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         return [this.gl.drawingBufferWidth, this.gl.drawingBufferHeight];
     }
     isTextureFormatSupported(format) {
-        return isTextureFormatSupported(this.gl, format);
+        return isTextureFormatSupported(this.gl, format, this._extensions);
     }
     isTextureFormatFilterable(format) {
-        return isTextureFormatFilterable(this.gl, format);
+        return isTextureFormatFilterable(this.gl, format, this._extensions);
     }
     isTextureFormatRenderable(format) {
-        return isTextureFormatRenderable(this.gl, format);
+        return isTextureFormatRenderable(this.gl, format, this._extensions);
     }
     // IMPLEMENTATION OF ABSTRACT DEVICE
     createCanvasContext(props) {
@@ -208,12 +213,18 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     createFramebuffer(props) {
         return new WEBGLFramebuffer(this, props);
     }
-    createRenderPipeline(props) {
-        return new WEBGLRenderPipeline(this, props);
-    }
     createVertexArray(props) {
         return new WEBGLVertexArray(this, props);
     }
+    createTransformFeedback(props) {
+        return new WEBGLTransformFeedback(this, props);
+    }
+    createQuerySet(props) {
+        return new WEBGLQuerySet(this, props);
+    }
+    createRenderPipeline(props) {
+        return new WEBGLRenderPipeline(this, props);
+    }
     beginRenderPass(props) {
         return new WEBGLRenderPass(this, props);
     }
@@ -223,18 +234,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     beginComputePass(props) {
         throw new Error('ComputePass not supported in WebGL');
     }
-    createTransformFeedback(props) {
-        return new WEBGLTransformFeedback(this, props);
-    }
     renderPass = null;
-    getDefaultRenderPass() {
-        this.renderPass =
-            this.renderPass ||
-                this.beginRenderPass({
-                    framebuffer: this.canvasContext.getCurrentFramebuffer()
-                });
-        return this.renderPass;
-    }
     createCommandEncoder(props) {
         return new WEBGLCommandEncoder(this, props);
     }
@@ -250,7 +250,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     }
     //
     // TEMPORARY HACKS - will be removed in v9.1
-    // 
+    //
     /** @deprecated - should use command encoder */
     readPixelsToArrayWebGL(source, options) {
         return readPixelsToArray(source, options);
@@ -260,13 +260,13 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
         return readPixelsToBuffer(source, options);
     }
     setParametersWebGL(parameters) {
-        setGLParameters(this, parameters);
+        setGLParameters(this.gl, parameters);
     }
     getParametersWebGL(parameters) {
-        return getGLParameters(this, parameters);
+        return getGLParameters(this.gl, parameters);
     }
     withParametersWebGL(parameters, func) {
-        withGLParameters(this, parameters, func);
+        withGLParameters(this.gl, parameters, func);
     }
     clearWebGL(options) {
         clear(this, options);
@@ -283,20 +283,15 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     _extensions = {};
     _polyfilled = false;
     /** Instance of Spector.js (if initialized) */
-    spector;
-    _webglLimits;
-    /** Return WebGL specific limits */
-    get webglLimits() {
-        this._webglLimits = this._webglLimits || getWebGLLimits(this.gl);
-        return this._webglLimits;
-    }
+    spectorJS;
     /**
      * Triggers device (or WebGL context) loss.
      * @note primarily intended for testing how application reacts to device loss
      */
     loseDevice() {
         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();
@@ -351,11 +346,12 @@ ${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, constant) {
-        this._constants = this._constants || new Array(this.limits.maxVertexAttributes).fill(null);
+    setConstantAttributeWebGL(location, constant) {
+        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;
         switch (constant.constructor) {
@@ -372,6 +368,11 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
                 assert(false);
         }
     }
+    /** Ensure extensions are only requested once */
+    getExtension(name) {
+        getWebGLExtension(this.gl, name, this._extensions);
+        return this._extensions;
+    }
 }
 /** Check if supplied parameter is a WebGL2RenderingContext */
 function isWebGL(gl) {

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

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

package/dist/classic/accessor.js

@@ -1,12 +1,13 @@
-// luma.gl, MIT license
+// 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';
+import { getTypedArrayFromGLType } from "./typed-array-utils.js";
 const DEFAULT_ACCESSOR_VALUES = {
     offset: 0,
     stride: 0,
-    type: GL.FLOAT,
+    type: 5126,
     size: 1,
     divisor: 0,
     normalized: false,
@@ -31,14 +32,14 @@ export class Accessor {
     static getBytesPerElement(accessor) {
         // TODO: using `FLOAT` when type is not specified,
         // ensure this assumption is valid or force API to specify type.
-        const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);
+        const ArrayType = getTypedArrayFromGLType(accessor.type || 5126);
         return ArrayType.BYTES_PER_ELEMENT;
     }
     static getBytesPerVertex(accessor) {
         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 || GL.FLOAT);
+        const ArrayType = getTypedArrayFromGLType(accessor.type || 5126);
         return ArrayType.BYTES_PER_ELEMENT * accessor.size;
     }
     // Combines (merges) a list of accessors. On top of default values
@@ -49,7 +50,7 @@ export class Accessor {
         return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values
     }
     constructor(...accessors) {
-        accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence
+        accessors.forEach(accessor => this._assign(accessor)); // Merge in sequence
         Object.freeze(this);
     }
     toString() {
@@ -70,7 +71,7 @@ export class Accessor {
         if (props.type !== undefined) {
             this.type = props.type;
             // Auto-deduce integer type?
-            if (props.type === GL.INT || props.type === GL.UNSIGNED_INT) {
+            if (props.type === 5124 || props.type === 5125) {
                 this.integer = true;
             }
         }

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

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

package/dist/classic/clear.js

@@ -1,7 +1,8 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { assert } from '@luma.gl/core';
-import { withGLParameters } from '../context/state-tracker/with-parameters';
+import { withGLParameters } from "../context/state-tracker/with-parameters.js";
 // Should collapse during minification
 const GL_DEPTH_BUFFER_BIT = 0x00000100;
 const GL_STENCIL_BUFFER_BIT = 0x00000400;
@@ -43,8 +44,8 @@ export function clear(device, options) {
     }
     assert(clearFlags !== 0, ERR_ARGUMENTS);
     // Temporarily set any clear "colors" and call clear
-    withGLParameters(device, parameters, () => {
-        const gl = device.gl;
+    const gl = device.gl;
+    withGLParameters(gl, parameters, () => {
         gl.clear(clearFlags);
     });
 }

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

@@ -1,6 +1,6 @@
 import { Buffer, Texture, Framebuffer, FramebufferProps } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WEBGLBuffer } from '../adapter/resources/webgl-buffer';
+import { WEBGLBuffer } from "../adapter/resources/webgl-buffer.js";
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
  * App can provide targetPixelArray or have it auto allocated by this method

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

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

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

@@ -1,9 +1,10 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { assert, Texture, Framebuffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from './typed-array-utils';
-import { glFormatToComponents, glTypeToBytes } from './format-utils';
+import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from "./typed-array-utils.js";
+import { glFormatToComponents, glTypeToBytes } from "./format-utils.js";
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
  * App can provide targetPixelArray or have it auto allocated by this method
@@ -16,7 +17,7 @@ import { glFormatToComponents, glTypeToBytes } from './format-utils';
  * @returns pixel array,
  */
 export function readPixelsToArray(source, options) {
-    const { sourceX = 0, sourceY = 0, sourceFormat = GL.RGBA, sourceAttachment = GL.COLOR_ATTACHMENT0 // TODO - support gl.readBuffer
+    const { sourceX = 0, sourceY = 0, sourceFormat = 6408, sourceAttachment = 36064 // TODO - support gl.readBuffer
      } = options || {};
     let { target = null, 
     // following parameters are auto deduced if not provided
@@ -30,21 +31,20 @@ export function readPixelsToArray(source, options) {
     // if (sourceAttachment === GL.COLOR_ATTACHMENT0 && handle === null) {
     //   sourceAttachment = GL.FRONT;
     // }
-    const attachment = sourceAttachment - GL.COLOR_ATTACHMENT0;
+    const attachment = sourceAttachment - 36064;
     // assert(attachments[sourceAttachment]);
     // Deduce the type from color attachment if not provided.
     sourceType =
         sourceType ||
-            framebuffer.colorAttachments[attachment]?.type ||
-            GL.UNSIGNED_BYTE;
+            framebuffer.colorAttachments[attachment]?.texture?.type || 5121;
     // Deduce type and allocated pixelArray if needed
     target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight);
     // Pixel array available, if necessary, deduce type from it.
     sourceType = sourceType || getGLTypeFromTypedArray(target);
-    const prevHandle = gl.bindFramebuffer(GL.FRAMEBUFFER, handle);
+    const prevHandle = gl.bindFramebuffer(36160, handle);
     gl.readPixels(sourceX, sourceY, sourceWidth, sourceHeight, sourceFormat, sourceType, target);
     // @ts-expect-error
-    gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle || null);
+    gl.bindFramebuffer(36160, prevHandle || null);
     if (deleteFramebuffer) {
         framebuffer.destroy();
     }
@@ -58,7 +58,7 @@ export function readPixelsToArray(source, options) {
  * @param options
  */
 export function readPixelsToBuffer(source, options) {
-    const { target, sourceX = 0, sourceY = 0, sourceFormat = GL.RGBA, targetByteOffset = 0 } = options || {};
+    const { target, sourceX = 0, sourceY = 0, sourceFormat = 6408, targetByteOffset = 0 } = options || {};
     // following parameters are auto deduced if not provided
     let { sourceWidth, sourceHeight, sourceType } = options || {};
     const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
@@ -68,7 +68,7 @@ export function readPixelsToBuffer(source, options) {
     // Asynchronous read (PIXEL_PACK_BUFFER) is WebGL2 only feature
     const webglFramebuffer = framebuffer;
     // deduce type if not available.
-    sourceType = sourceType || GL.UNSIGNED_BYTE;
+    sourceType = sourceType || 5121;
     let webglBufferTarget = target;
     if (!webglBufferTarget) {
         // Create new buffer with enough size
@@ -101,7 +101,7 @@ export function readPixelsToBuffer(source, options) {
 export function copyToTexture(source, target, options) {
     const { sourceX = 0, sourceY = 0, 
     // attachment = GL.COLOR_ATTACHMENT0, // TODO - support gl.readBuffer
-    targetMipmaplevel = 0, targetInternalFormat = GL.RGBA } = options || {};
+    targetMipmaplevel = 0, targetInternalFormat = 6408 } = options || {};
     let { targetX, targetY, targetZ, width, // defaults to target width
     height // defaults to target height
      } = options || {};
@@ -115,7 +115,7 @@ export function copyToTexture(source, target, options) {
     targetX = targetX || 0;
     targetY = targetY || 0;
     targetZ = targetZ || 0;
-    const prevHandle = device.gl.bindFramebuffer(GL.FRAMEBUFFER, handle);
+    const prevHandle = device.gl.bindFramebuffer(36160, handle);
     // TODO - support gl.readBuffer (WebGL2 only)
     // const prevBuffer = gl.readBuffer(attachment);
     assert(target);
@@ -136,12 +136,12 @@ export function copyToTexture(source, target, options) {
     }
     else {
         switch (textureTarget) {
-            case GL.TEXTURE_2D:
-            case GL.TEXTURE_CUBE_MAP:
+            case 3553:
+            case 34067:
                 device.gl.copyTexSubImage2D(textureTarget, targetMipmaplevel, targetX, targetY, sourceX, sourceY, width, height);
                 break;
-            case GL.TEXTURE_2D_ARRAY:
-            case GL.TEXTURE_3D:
+            case 35866:
+            case 32879:
                 device.gl.copyTexSubImage3D(textureTarget, targetMipmaplevel, targetX, targetY, targetZ, sourceX, sourceY, width, height);
                 break;
             default:
@@ -151,7 +151,7 @@ export function copyToTexture(source, target, options) {
         texture.unbind();
     }
     // @ts-expect-error
-    device.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle || null);
+    device.gl.bindFramebuffer(36160, prevHandle || null);
     if (deleteFramebuffer) {
         framebuffer.destroy();
     }
@@ -183,7 +183,7 @@ function getPixelArray(pixelArray, type, format, width, height) {
         return pixelArray;
     }
     // Allocate pixel array if not already available, using supplied type
-    type = type || GL.UNSIGNED_BYTE;
+    type = type || 5121;
     const ArrayType = getTypedArrayFromGLType(type, { clamped: false });
     const components = glFormatToComponents(format);
     // TODO - check for composite type (components = 1).

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

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

package/dist/classic/format-utils.js

@@ -1,22 +1,23 @@
-// luma.gl, MIT license
+// luma.gl
+// 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
 export function glFormatToComponents(format) {
     switch (format) {
-        case GL.ALPHA:
-        case GL.R32F:
-        case GL.RED:
+        case 6406:
+        case 33326:
+        case 6403:
             return 1;
-        case GL.RG32F:
-        case GL.RG:
+        case 33328:
+        case 33319:
             return 2;
-        case GL.RGB:
-        case GL.RGB32F:
+        case 6407:
+        case 34837:
             return 3;
-        case GL.RGBA:
-        case GL.RGBA32F:
+        case 6408:
+        case 34836:
             return 4;
         // TODO: Add support for additional WebGL2 formats
         default:
@@ -27,13 +28,13 @@ export function glFormatToComponents(format) {
 // Return byte count for given readPixels WebGL type
 export function glTypeToBytes(type) {
     switch (type) {
-        case GL.UNSIGNED_BYTE:
+        case 5121:
             return 1;
-        case GL.UNSIGNED_SHORT_5_6_5:
-        case GL.UNSIGNED_SHORT_4_4_4_4:
-        case GL.UNSIGNED_SHORT_5_5_5_1:
+        case 33635:
+        case 32819:
+        case 32820:
             return 2;
-        case GL.FLOAT:
+        case 5126:
             return 4;
         // TODO: Add support for additional WebGL2 types
         default: