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

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

@@ -1,10 +1,11 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Framebuffer, assert } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WEBGLTexture } from './webgl-texture';
-import { WEBGLRenderbuffer } from '../objects/webgl-renderbuffer';
-import { getDepthStencilAttachmentWebGL } from '../converters/texture-formats';
+import { WEBGLTexture } from "./webgl-texture.js";
+import { WEBGLTextureView } from "./webgl-texture-view.js";
+import { getDepthStencilAttachmentWebGL } from "../converters/texture-formats.js";
 /** luma.gl Framebuffer, WebGL implementation  */
 export class WEBGLFramebuffer extends Framebuffer {
     device;
@@ -27,23 +28,27 @@ export class WEBGLFramebuffer extends Framebuffer {
             // Auto create textures for attachments if needed
             this.autoCreateAttachmentTextures();
             /** Attach from a map of attachments */
-            this.gl.bindFramebuffer(GL.FRAMEBUFFER, this.handle);
+            this.gl.bindFramebuffer(36160, this.handle);
             // Walk the attachments
             for (let i = 0; i < this.colorAttachments.length; ++i) {
                 const attachment = this.colorAttachments[i];
-                const attachmentPoint = GL.COLOR_ATTACHMENT0 + i;
+                const attachmentPoint = 36064 + i;
                 if (attachment) {
                     this._attachOne(attachmentPoint, attachment);
                 }
             }
             if (this.depthStencilAttachment) {
-                this._attachOne(getDepthStencilAttachmentWebGL(this.depthStencilAttachment.format), this.depthStencilAttachment);
+                this._attachOne(getDepthStencilAttachmentWebGL(this.depthStencilAttachment.props.format), this.depthStencilAttachment);
             }
-            this.gl.bindFramebuffer(GL.FRAMEBUFFER, null);
-        }
-        // @ts-expect-error
-        if (props.check !== false) {
-            this._checkStatus();
+            /** Check the status */
+            // @ts-expect-error
+            if (props.check !== false) {
+                const status = this.gl.checkFramebufferStatus(36160);
+                if (status !== 36053) {
+                    throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
+                }
+            }
+            this.gl.bindFramebuffer(36160, null);
         }
     }
     /** destroys any auto created resources etc. */
@@ -55,26 +60,15 @@ export class WEBGLFramebuffer extends Framebuffer {
         }
     }
     // PRIVATE
-    /** Check the status */
-    _checkStatus() {
-        const { gl } = this;
-        // TODO - should we really rely on this trick? 
-        const prevHandle = gl.bindFramebuffer(GL.FRAMEBUFFER, this.handle);
-        const status = gl.checkFramebufferStatus(GL.FRAMEBUFFER);
-        gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle || null);
-        if (status !== gl.FRAMEBUFFER_COMPLETE) {
-            throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
-        }
-    }
     /** In WebGL we must use renderbuffers for depth/stencil attachments (unless we have extensions) */
     createDepthStencilTexture(format) {
-        return new WEBGLRenderbuffer(this.device, {
-            id: `${this.id}-depth-stencil`, // TODO misleading if not depth and stencil?
+        // return new WEBGLRenderbuffer(this.device, {
+        return new WEBGLTexture(this.device, {
+            id: `${this.id}-depth-stencil`,
             format,
-            // dataFormat: GL.DEPTH_STENCIL,
-            // type: GL.UNSIGNED_INT_24_8,
             width: this.width,
-            height: this.height
+            height: this.height,
+            mipmaps: false
         });
     }
     /**
@@ -96,33 +90,44 @@ export class WEBGLFramebuffer extends Framebuffer {
         }
         // TODO Not clear that this is better than default destroy/create implementation
         for (const colorAttachment of this.colorAttachments) {
-            colorAttachment.resize({ width, height });
+            colorAttachment.texture.resize({ width, height });
         }
         if (this.depthStencilAttachment) {
-            this.depthStencilAttachment.resize({ width, height });
+            this.depthStencilAttachment.texture.resize({ width, height });
         }
         return this;
     }
     /** Attach one attachment */
     _attachOne(attachmentPoint, attachment) {
-        if (attachment instanceof WEBGLRenderbuffer) {
-            this._attachWEBGLRenderbuffer(attachmentPoint, attachment);
-            return attachment;
-        }
-        else if (Array.isArray(attachment)) {
+        // if (attachment instanceof WEBGLRenderbuffer) {
+        //   this._attachWEBGLRenderbuffer(attachmentPoint, attachment);
+        //   return attachment;
+        // }
+        if (Array.isArray(attachment)) {
             const [texture, layer = 0, level = 0] = attachment;
             this._attachTexture(attachmentPoint, texture, layer, level);
             return texture;
         }
-        else if (attachment instanceof WEBGLTexture) {
+        if (attachment instanceof WEBGLTexture) {
             this._attachTexture(attachmentPoint, attachment, 0, 0);
             return attachment;
         }
+        if (attachment instanceof WEBGLTextureView) {
+            const textureView = attachment;
+            this._attachTexture(attachmentPoint, textureView.texture, textureView.props.baseMipLevel, textureView.props.baseArrayLayer);
+            return attachment.texture;
+        }
         throw new Error('attach');
     }
-    _attachWEBGLRenderbuffer(attachment, renderbuffer) {
-        this.gl.framebufferRenderbuffer(GL.FRAMEBUFFER, attachment, GL.RENDERBUFFER, renderbuffer.handle);
-    }
+    // TODO - we do not seem to need render buffers in WebGL 2
+    // protected _attachWEBGLRenderbuffer(attachment: GL, renderbuffer: WEBGLRenderbuffer): void {
+    //   this.gl.framebufferRenderbuffer(
+    //     GL.FRAMEBUFFER,
+    //     attachment,
+    //     GL.RENDERBUFFER,
+    //     renderbuffer.handle
+    //   );
+    // }
     /**
      * @param attachment
      * @param texture
@@ -133,17 +138,17 @@ export class WEBGLFramebuffer extends Framebuffer {
         const { gl } = this.device;
         gl.bindTexture(texture.target, texture.handle);
         switch (texture.target) {
-            case GL.TEXTURE_2D_ARRAY:
-            case GL.TEXTURE_3D:
-                gl.framebufferTextureLayer(GL.FRAMEBUFFER, attachment, texture.target, level, layer);
+            case 35866:
+            case 32879:
+                gl.framebufferTextureLayer(36160, attachment, texture.target, level, layer);
                 break;
-            case GL.TEXTURE_CUBE_MAP:
+            case 34067:
                 // layer must be a cubemap face (or if index, converted to cube map face)
                 const face = mapIndexToCubeMapFace(layer);
-                gl.framebufferTexture2D(GL.FRAMEBUFFER, attachment, face, texture.handle, level);
+                gl.framebufferTexture2D(36160, attachment, face, texture.handle, level);
                 break;
-            case GL.TEXTURE_2D:
-                gl.framebufferTexture2D(GL.FRAMEBUFFER, attachment, GL.TEXTURE_2D, texture.handle, level);
+            case 3553:
+                gl.framebufferTexture2D(36160, attachment, 3553, texture.handle, level);
                 break;
             default:
                 assert(false, 'Illegal texture type');
@@ -156,24 +161,26 @@ export class WEBGLFramebuffer extends Framebuffer {
 function mapIndexToCubeMapFace(layer) {
     // TEXTURE_CUBE_MAP_POSITIVE_X is a big value (0x8515)
     // if smaller assume layer is index, otherwise assume it is already a cube map face constant
-    return layer < GL.TEXTURE_CUBE_MAP_POSITIVE_X ? layer + GL.TEXTURE_CUBE_MAP_POSITIVE_X : layer;
+    return layer < 34069
+        ? layer + 34069
+        : layer;
 }
 // Helper METHODS
 // Get a string describing the framebuffer error if installed
 function _getFrameBufferStatus(status) {
     switch (status) {
-        case GL.FRAMEBUFFER_COMPLETE:
+        case 36053:
             return 'success';
-        case GL.FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+        case 36054:
             return 'Mismatched attachments';
-        case GL.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+        case 36055:
             return 'No attachments';
-        case GL.FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+        case 36057:
             return 'Height/width mismatch';
-        case GL.FRAMEBUFFER_UNSUPPORTED:
+        case 36061:
             return 'Unsupported or split attachments';
         // WebGL2
-        case GL.FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+        case 36182:
             return 'Samples mismatch';
         // OVR_multiview2 extension
         // case GL.FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR: return 'baseViewIndex mismatch';

package/dist/adapter/resources/webgl-query-set.d.ts

@@ -0,0 +1,44 @@
+import { QuerySet, QuerySetProps } from '@luma.gl/core';
+import { WebGLDevice } from "../webgl-device.js";
+/**
+ * Asynchronous queries for different kinds of information
+ */
+export declare class WEBGLQuerySet extends QuerySet {
+    device: WebGLDevice;
+    handle: WebGLQuery;
+    target: number | null;
+    _queryPending: boolean;
+    _pollingPromise: Promise<any> | null;
+    get [Symbol.toStringTag](): string;
+    constructor(device: WebGLDevice, props: QuerySetProps);
+    destroy(): void;
+    /**
+     * Shortcut for timer query (dependent on extension in both WebGL1 and 2)
+     * Measures GPU time delta between this call and a matching `end` call in the
+     * GPU instruction stream.
+     */
+    beginTimestampQuery(): void;
+    endTimestampQuery(): void;
+    beginOcclusionQuery(options?: {
+        conservative?: boolean;
+    }): void;
+    endOcclusionQuery(): void;
+    beginTransformFeedbackQuery(): void;
+    endTransformFeedbackQuery(): void;
+    resolveQuery(): Promise<bigint[]>;
+    /**
+     * Due to OpenGL API limitations, after calling `begin()` on one Query
+     * instance, `end()` must be called on that same instance before
+     * calling `begin()` on another query. While there can be multiple
+     * outstanding queries representing disjoint `begin()`/`end()` intervals.
+     * It is not possible to interleave or overlap `begin` and `end` calls.
+     */
+    protected _begin(target: number): void;
+    protected _end(): void;
+    isResultAvailable(): boolean;
+    isTimerDisjoint(): boolean;
+    getResult(): any;
+    getTimerMilliseconds(): number;
+    pollQuery(limit?: number): Promise<any>;
+}
+//# sourceMappingURL=webgl-query-set.d.ts.map

package/dist/adapter/resources/webgl-query-set.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-query-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C;;GAEG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IAEnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7B,aAAa,UAAS;IACtB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE5C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAGW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa;IAY5C,OAAO;IAMhB;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;IAI3B,iBAAiB,IAAI,IAAI;IAKzB,mBAAmB,CAAC,OAAO,CAAC,EAAE;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAM7D,iBAAiB;IAKjB,2BAA2B,IAAI,IAAI;IAInC,yBAAyB,IAAI,IAAI;IAI3B,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAOvC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAatC,SAAS,CAAC,IAAI,IAAI,IAAI;IAetB,iBAAiB,IAAI,OAAO;IAgB5B,eAAe,IAAI,OAAO;IAK1B,SAAS,IAAI,GAAG;IAKhB,oBAAoB;IAKpB,SAAS,CAAC,KAAK,GAAE,MAAiC,GAAG,OAAO,CAAC,GAAG,CAAC;CAyBlE"}

package/dist/adapter/resources/webgl-query-set.js

@@ -0,0 +1,136 @@
+// WebGL2 Query (also handles disjoint timer extensions)
+import { QuerySet } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+/**
+ * Asynchronous queries for different kinds of information
+ */
+export class WEBGLQuerySet extends QuerySet {
+    device;
+    handle;
+    target = null;
+    _queryPending = false;
+    _pollingPromise = null;
+    get [Symbol.toStringTag]() {
+        return 'Query';
+    }
+    // Create a query class
+    constructor(device, props) {
+        super(device, props);
+        this.device = device;
+        if (props.count > 1) {
+            throw new Error('WebGL QuerySet can only have one value');
+        }
+        this.handle = this.device.gl.createQuery();
+        Object.seal(this);
+    }
+    destroy() {
+        this.device.gl.deleteQuery(this.handle);
+    }
+    // FOR RENDER PASS AND COMMAND ENCODER
+    /**
+     * Shortcut for timer query (dependent on extension in both WebGL1 and 2)
+     * Measures GPU time delta between this call and a matching `end` call in the
+     * GPU instruction stream.
+     */
+    beginTimestampQuery() {
+        return this._begin(35007);
+    }
+    endTimestampQuery() {
+        this._end();
+    }
+    // Shortcut for occlusion queries
+    beginOcclusionQuery(options) {
+        return this._begin(options?.conservative ? 36202 : 35887);
+    }
+    endOcclusionQuery() {
+        this._end();
+    }
+    // Shortcut for transformFeedbackQuery
+    beginTransformFeedbackQuery() {
+        return this._begin(35976);
+    }
+    endTransformFeedbackQuery() {
+        this._end();
+    }
+    async resolveQuery() {
+        const value = await this.pollQuery();
+        return [value];
+    }
+    // PRIVATE METHODS
+    /**
+     * Due to OpenGL API limitations, after calling `begin()` on one Query
+     * instance, `end()` must be called on that same instance before
+     * calling `begin()` on another query. While there can be multiple
+     * outstanding queries representing disjoint `begin()`/`end()` intervals.
+     * It is not possible to interleave or overlap `begin` and `end` calls.
+     */
+    _begin(target) {
+        // Don't start a new query if one is already active.
+        if (this._queryPending) {
+            return;
+        }
+        this.target = target;
+        this.device.gl.beginQuery(this.target, this.handle);
+        return;
+    }
+    // ends the current query
+    _end() {
+        // Can't end a new query if the last one hasn't been resolved.
+        if (this._queryPending) {
+            return;
+        }
+        if (this.target) {
+            this.device.gl.endQuery(this.target);
+            this.target = null;
+            this._queryPending = true;
+        }
+        return;
+    }
+    // Returns true if the query result is available
+    isResultAvailable() {
+        if (!this._queryPending) {
+            return false;
+        }
+        const resultAvailable = this.device.gl.getQueryParameter(this.handle, 34919);
+        if (resultAvailable) {
+            this._queryPending = false;
+        }
+        return resultAvailable;
+    }
+    // Timing query is disjoint, i.e. results are invalid
+    isTimerDisjoint() {
+        return this.device.gl.getParameter(36795);
+    }
+    // Returns query result.
+    getResult() {
+        return this.device.gl.getQueryParameter(this.handle, 34918);
+    }
+    // Returns the query result, converted to milliseconds to match JavaScript conventions.
+    getTimerMilliseconds() {
+        return this.getResult() / 1e6;
+    }
+    // Polls the query
+    pollQuery(limit = Number.POSITIVE_INFINITY) {
+        if (this._pollingPromise) {
+            return this._pollingPromise;
+        }
+        let counter = 0;
+        this._pollingPromise = new Promise((resolve, reject) => {
+            const poll = () => {
+                if (this.isResultAvailable()) {
+                    resolve(this.getResult());
+                    this._pollingPromise = null;
+                }
+                else if (counter++ > limit) {
+                    reject('Timed out');
+                    this._pollingPromise = null;
+                }
+                else {
+                    requestAnimationFrame(poll);
+                }
+            };
+            requestAnimationFrame(poll);
+        });
+        return this._pollingPromise;
+    }
+}

package/dist/adapter/resources/webgl-render-pass.d.ts

@@ -1,5 +1,5 @@
 import { RenderPass, RenderPassProps, NumberArray, RenderPassParameters } from '@luma.gl/core';
-import { WebGLDevice } from '../webgl-device';
+import { WebGLDevice } from "../webgl-device.js";
 import { GLParameters } from '@luma.gl/constants';
 export declare class WEBGLRenderPass extends RenderPass {
     readonly device: WebGLDevice;
@@ -14,6 +14,8 @@ export declare class WEBGLRenderPass extends RenderPass {
      * Maps RenderPass parameters to GL parameters
      */
     setParameters(parameters?: RenderPassParameters): void;
+    beginOcclusionQuery(queryIndex: number): void;
+    endOcclusionQuery(): void;
     /**
      * Optionally clears depth, color and stencil buffers based on parameters
      */

package/dist/adapter/resources/webgl-render-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAYpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;gBAEf,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAYvD,GAAG,IAAI,IAAI;IAQX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAS5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAiD1D;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IA+BvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,WAA0B;CAwCrF"}
+{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAapD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;gBAEf,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAYvD,GAAG,IAAI,IAAI;IAQX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IA+C1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IA+BvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,WAA0B;CAwCrF"}

package/dist/adapter/resources/webgl-render-pass.js

@@ -1,10 +1,11 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { RenderPass } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { withGLParameters } from '../../context/state-tracker/with-parameters';
-import { setGLParameters } from '../../context/parameters/unified-parameter-api';
-import { pushContextState, popContextState } from '../../context/state-tracker/track-context-state';
+import { withGLParameters } from "../../context/state-tracker/with-parameters.js";
+import { setGLParameters } from "../../context/parameters/unified-parameter-api.js";
+import { pushContextState, popContextState } from "../../context/state-tracker/track-context-state.js";
 // Should collapse during minification
 const GL_DEPTH_BUFFER_BIT = 0x00000100;
 const GL_STENCIL_BUFFER_BIT = 0x00000400;
@@ -26,14 +27,13 @@ export class WEBGLRenderPass extends RenderPass {
     end() {
         popContextState(this.device.gl);
         if (this.props.framebuffer) {
-            setGLParameters(this.device, { framebuffer: null });
+            setGLParameters(this.device.gl, { framebuffer: null });
         }
         // should add commands to CommandEncoder.
     }
     pushDebugGroup(groupLabel) { }
     popDebugGroup() { }
     insertDebugMarker(markerLabel) { }
-    // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;
     // beginOcclusionQuery(queryIndex: number): void;
     // endOcclusionQuery(): void;
     // executeBundles(bundles: Iterable<GPURenderBundle>): void;
@@ -50,7 +50,7 @@ export class WEBGLRenderPass extends RenderPass {
             glParameters.depthMask = !this.props.depthReadOnly;
         }
         glParameters.stencilMask = this.props.stencilReadOnly ? 0 : 1;
-        glParameters[GL.RASTERIZER_DISCARD] = this.props.discard;
+        glParameters[35977] = this.props.discard;
         // Map the four renderpass parameters to WebGL parameters
         if (parameters.viewport) {
             // WebGPU viewports are 6 coordinates (X, Y, Z)
@@ -75,12 +75,20 @@ export class WEBGLRenderPass extends RenderPass {
             console.warn('RenderPassParameters.stencilReference not yet implemented in WebGL');
             // parameters.stencilFunc = [func, ref, mask];
             // Does this work?
-            parameters[GL.STENCIL_REF] = parameters.stencilReference;
+            parameters[2967] = parameters.stencilReference;
         }
         this.glParameters = glParameters;
-        setGLParameters(this.device, glParameters);
+        setGLParameters(this.device.gl, glParameters);
     }
-    // Internal
+    beginOcclusionQuery(queryIndex) {
+        const webglQuerySet = this.props.occlusionQuerySet;
+        webglQuerySet?.beginOcclusionQuery();
+    }
+    endOcclusionQuery() {
+        const webglQuerySet = this.props.occlusionQuerySet;
+        webglQuerySet?.endOcclusionQuery();
+    }
+    // PRIVATE
     /**
      * Optionally clears depth, color and stencil buffers based on parameters
      */
@@ -101,12 +109,12 @@ export class WEBGLRenderPass extends RenderPass {
         }
         if (clearMask !== 0) {
             // Temporarily set any clear "colors" and call clear
-            withGLParameters(this.device, glParameters, () => {
+            withGLParameters(this.device.gl, glParameters, () => {
                 this.device.gl.clear(clearMask);
             });
             // TODO - clear multiple color attachments
             // for (attachment of this.framebuffer.colorAttachments) {
-            //   this.clearColorBuffer  
+            //   this.clearColorBuffer
             // }
         }
     }

package/dist/adapter/resources/webgl-render-pipeline.d.ts

@@ -2,9 +2,9 @@ import type { UniformValue, RenderPipelineProps, Binding } from '@luma.gl/core';
 import type { ShaderLayout } from '@luma.gl/core';
 import type { RenderPass, VertexArray } from '@luma.gl/core';
 import { RenderPipeline } from '@luma.gl/core';
-import { WebGLDevice } from '../webgl-device';
-import { WEBGLShader } from './webgl-shader';
-import { WEBGLTransformFeedback } from './webgl-transform-feedback';
+import { WebGLDevice } from "../webgl-device.js";
+import { WEBGLShader } from "./webgl-shader.js";
+import { WEBGLTransformFeedback } from "./webgl-transform-feedback.js";
 /** Creates a new render pipeline */
 export declare class WEBGLRenderPipeline extends RenderPipeline {
     /** The WebGL device that created this render pipeline */
@@ -32,8 +32,6 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
      * @todo needed for portable model
      */
     setBindings(bindings: Record<string, Binding>): void;
-    /** This function is @deprecated, use uniform buffers */
-    setUniforms(uniforms: Record<string, UniformValue>): void;
     /** @todo needed for portable model
      * @note The WebGL API is offers many ways to draw things
      * This function unifies those ways into a single call using common parameters with sane defaults
@@ -51,6 +49,7 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
         baseVertex?: number;
         transformFeedback?: WEBGLTransformFeedback;
     }): boolean;
+    setUniformsWebGL(uniforms: Record<string, UniformValue>): void;
     protected _linkShaders(): Promise<void>;
     /** Report link status. First, check for shader compilation failures if linking fails */
     _reportLinkStatus(status: 'success' | 'linking' | 'validation'): void;

package/dist/adapter/resources/webgl-render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,mBAAmB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAsC,MAAM,eAAe,CAAC;AAUlF,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAK3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAKlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yCAAyC;IACzC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAsClD,OAAO,IAAI,IAAI;IAQxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAiDpD,wDAAwD;IACxD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAalD;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,wBAAwB;QACxB,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;KAC5C,GAAG,OAAO;cAsHK,YAAY;IA2B5B,wFAAwF;IACxF,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY;IAmB9D;;;;OAIG;IACH,cAAc,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY;IAmBtD,6DAA6D;IACvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3C;;;;OAIG;IACH,sBAAsB;IAatB,iDAAiD;IACjD,cAAc;IAiFd;;;OAGG;IACH,cAAc;CASf"}
+{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,mBAAmB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAsC,MAAM,eAAe,CAAC;AAUlF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAK3C,OAAO,EAAC,sBAAsB,EAAC,sCAAmC;AAKlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yCAAyC;IACzC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAyClD,OAAO,IAAI,IAAI;IAQxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAuDpD;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,wBAAwB;QACxB,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;KAC5C,GAAG,OAAO;IAgGF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;cAkBhD,YAAY;IA2B5B,wFAAwF;IACxF,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY;IAmB9D;;;;OAIG;IACH,cAAc,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY;IAmBtD,6DAA6D;IACvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3C;;;;OAIG;IACH,sBAAsB;IAatB,iDAAiD;IACjD,cAAc;IAyFd;;;OAGG;IACH,cAAc;CASf"}