@luma.gl/webgl 9.2.6 → 9.3.0-alpha.10

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

@@ -1,141 +1,292 @@
-// WebGL2 Query (also handles disjoint timer extensions)
+// WebGL2 QuerySet (also handles disjoint timer extensions)
 import { QuerySet } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GL } from '@luma.gl/webgl/constants';
 /**
  * Asynchronous queries for different kinds of information
  */
 export class WEBGLQuerySet extends QuerySet {
     device;
     handle;
-    target = null;
-    _queryPending = false;
-    _pollingPromise = null;
+    _timestampPairs = [];
+    _pendingReads = new Set();
+    _occlusionQuery = null;
+    _occlusionActive = false;
     get [Symbol.toStringTag]() {
-        return 'Query';
+        return 'QuerySet';
     }
-    // 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');
+        if (props.type === 'timestamp') {
+            if (props.count < 2) {
+                throw new Error('Timestamp QuerySet requires at least two query slots');
+            }
+            this._timestampPairs = new Array(Math.ceil(props.count / 2))
+                .fill(null)
+                .map(() => ({ activeQuery: null, completedQueries: [] }));
+            this.handle = null;
         }
-        const handle = this.device.gl.createQuery();
-        if (!handle) {
-            throw new Error('WebGL query not supported');
+        else {
+            if (props.count > 1) {
+                throw new Error('WebGL occlusion QuerySet can only have one value');
+            }
+            const handle = this.device.gl.createQuery();
+            if (!handle) {
+                throw new Error('WebGL query not supported');
+            }
+            this.handle = handle;
         }
-        this.handle = handle;
         Object.seal(this);
     }
     destroy() {
-        this.device.gl.deleteQuery(this.handle);
+        if (this.destroyed) {
+            return;
+        }
+        if (this.handle) {
+            this.device.gl.deleteQuery(this.handle);
+        }
+        for (const pair of this._timestampPairs) {
+            if (pair.activeQuery) {
+                this._cancelPendingQuery(pair.activeQuery);
+                this.device.gl.deleteQuery(pair.activeQuery.handle);
+            }
+            for (const query of pair.completedQueries) {
+                this._cancelPendingQuery(query);
+                this.device.gl.deleteQuery(query.handle);
+            }
+        }
+        if (this._occlusionQuery) {
+            this._cancelPendingQuery(this._occlusionQuery);
+            this.device.gl.deleteQuery(this._occlusionQuery.handle);
+        }
+        for (const query of Array.from(this._pendingReads)) {
+            this._cancelPendingQuery(query);
+        }
+        this.destroyResource();
+    }
+    isResultAvailable(queryIndex) {
+        if (this.props.type === 'timestamp') {
+            if (queryIndex === undefined) {
+                return this._timestampPairs.some((_, pairIndex) => this._isTimestampPairAvailable(pairIndex));
+            }
+            return this._isTimestampPairAvailable(this._getTimestampPairIndex(queryIndex));
+        }
+        if (!this._occlusionQuery) {
+            return false;
+        }
+        return this._pollQueryAvailability(this._occlusionQuery);
     }
-    // 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);
+    async readResults(options) {
+        const firstQuery = options?.firstQuery || 0;
+        const queryCount = options?.queryCount || this.props.count - firstQuery;
+        this._validateRange(firstQuery, queryCount);
+        if (this.props.type === 'timestamp') {
+            const results = new Array(queryCount).fill(0n);
+            const startPairIndex = Math.floor(firstQuery / 2);
+            const endPairIndex = Math.floor((firstQuery + queryCount - 1) / 2);
+            for (let pairIndex = startPairIndex; pairIndex <= endPairIndex; pairIndex++) {
+                const duration = await this._consumeTimestampPairResult(pairIndex);
+                const beginSlot = pairIndex * 2;
+                const endSlot = beginSlot + 1;
+                if (beginSlot >= firstQuery && beginSlot < firstQuery + queryCount) {
+                    results[beginSlot - firstQuery] = 0n;
+                }
+                if (endSlot >= firstQuery && endSlot < firstQuery + queryCount) {
+                    results[endSlot - firstQuery] = duration;
+                }
+            }
+            return results;
+        }
+        if (!this._occlusionQuery) {
+            throw new Error('Occlusion query has not been started');
+        }
+        return [await this._consumeQueryResult(this._occlusionQuery)];
     }
-    endTimestampQuery() {
-        this._end();
+    async readTimestampDuration(beginIndex, endIndex) {
+        if (this.props.type !== 'timestamp') {
+            throw new Error('Timestamp durations require a timestamp QuerySet');
+        }
+        if (beginIndex < 0 || endIndex >= this.props.count || endIndex <= beginIndex) {
+            throw new Error('Timestamp duration range is out of bounds');
+        }
+        if (beginIndex % 2 !== 0 || endIndex !== beginIndex + 1) {
+            throw new Error('WebGL timestamp durations require adjacent even/odd query indices');
+        }
+        const result = await this._consumeTimestampPairResult(this._getTimestampPairIndex(beginIndex));
+        return Number(result) / 1e6;
     }
-    // Shortcut for occlusion queries
-    beginOcclusionQuery(options) {
-        return this._begin(options?.conservative ? 36202 : 35887);
+    beginOcclusionQuery() {
+        if (this.props.type !== 'occlusion') {
+            throw new Error('Occlusion queries require an occlusion QuerySet');
+        }
+        if (!this.handle) {
+            throw new Error('WebGL occlusion query is not available');
+        }
+        if (this._occlusionActive) {
+            throw new Error('Occlusion query is already active');
+        }
+        this.device.gl.beginQuery(35887, this.handle);
+        this._occlusionQuery = {
+            handle: this.handle,
+            promise: null,
+            result: null,
+            disjoint: false,
+            cancelled: false,
+            pollRequestId: null,
+            resolve: null,
+            reject: null
+        };
+        this._occlusionActive = true;
     }
     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;
+        if (!this._occlusionActive) {
+            throw new Error('Occlusion query is not active');
         }
-        this.target = target;
-        this.device.gl.beginQuery(this.target, this.handle);
-        return;
+        this.device.gl.endQuery(35887);
+        this._occlusionActive = false;
     }
-    // ends the current query
-    _end() {
-        // Can't end a new query if the last one hasn't been resolved.
-        if (this._queryPending) {
+    writeTimestamp(queryIndex) {
+        if (this.props.type !== 'timestamp') {
+            throw new Error('Timestamp writes require a timestamp QuerySet');
+        }
+        const pairIndex = this._getTimestampPairIndex(queryIndex);
+        const pair = this._timestampPairs[pairIndex];
+        if (queryIndex % 2 === 0) {
+            if (pair.activeQuery) {
+                throw new Error('Timestamp query pair is already active');
+            }
+            const handle = this.device.gl.createQuery();
+            if (!handle) {
+                throw new Error('WebGL query not supported');
+            }
+            const query = {
+                handle,
+                promise: null,
+                result: null,
+                disjoint: false,
+                cancelled: false,
+                pollRequestId: null,
+                resolve: null,
+                reject: null
+            };
+            this.device.gl.beginQuery(35007, handle);
+            pair.activeQuery = query;
             return;
         }
-        if (this.target) {
-            this.device.gl.endQuery(this.target);
-            this.target = null;
-            this._queryPending = true;
+        if (!pair.activeQuery) {
+            throw new Error('Timestamp query pair was ended before it was started');
         }
-        return;
+        this.device.gl.endQuery(35007);
+        pair.completedQueries.push(pair.activeQuery);
+        pair.activeQuery = null;
     }
-    // Returns true if the query result is available
-    isResultAvailable() {
-        if (!this._queryPending) {
-            return false;
+    _validateRange(firstQuery, queryCount) {
+        if (firstQuery < 0 || queryCount < 0 || firstQuery + queryCount > this.props.count) {
+            throw new Error('Query read range is out of bounds');
         }
-        const resultAvailable = this.device.gl.getQueryParameter(this.handle, 34919);
-        if (resultAvailable) {
-            this._queryPending = false;
+    }
+    _getTimestampPairIndex(queryIndex) {
+        if (queryIndex < 0 || queryIndex >= this.props.count) {
+            throw new Error('Query index is out of bounds');
         }
-        return resultAvailable;
+        return Math.floor(queryIndex / 2);
     }
-    // Timing query is disjoint, i.e. results are invalid
-    isTimerDisjoint() {
-        return this.device.gl.getParameter(36795);
+    _isTimestampPairAvailable(pairIndex) {
+        const pair = this._timestampPairs[pairIndex];
+        if (!pair || pair.completedQueries.length === 0) {
+            return false;
+        }
+        return this._pollQueryAvailability(pair.completedQueries[0]);
     }
-    // Returns query result.
-    getResult() {
-        return this.device.gl.getQueryParameter(this.handle, 34918);
+    _pollQueryAvailability(query) {
+        if (query.cancelled || this.destroyed) {
+            query.result = 0n;
+            return true;
+        }
+        if (query.result !== null || query.disjoint) {
+            return true;
+        }
+        const resultAvailable = this.device.gl.getQueryParameter(query.handle, 34919);
+        if (!resultAvailable) {
+            return false;
+        }
+        const isDisjoint = Boolean(this.device.gl.getParameter(36795));
+        query.disjoint = isDisjoint;
+        query.result = isDisjoint
+            ? 0n
+            : BigInt(this.device.gl.getQueryParameter(query.handle, 34918));
+        return true;
     }
-    // Returns the query result, converted to milliseconds to match JavaScript conventions.
-    getTimerMilliseconds() {
-        return this.getResult() / 1e6;
+    async _consumeTimestampPairResult(pairIndex) {
+        const pair = this._timestampPairs[pairIndex];
+        if (!pair || pair.completedQueries.length === 0) {
+            throw new Error('Timestamp query pair has no completed result');
+        }
+        const query = pair.completedQueries.shift();
+        try {
+            return await this._consumeQueryResult(query);
+        }
+        finally {
+            this.device.gl.deleteQuery(query.handle);
+        }
     }
-    // Polls the query
-    pollQuery(limit = Number.POSITIVE_INFINITY) {
-        if (this._pollingPromise) {
-            return this._pollingPromise;
+    _consumeQueryResult(query) {
+        if (query.promise) {
+            return query.promise;
         }
-        let counter = 0;
-        this._pollingPromise = new Promise((resolve, reject) => {
+        this._pendingReads.add(query);
+        query.promise = new Promise((resolve, reject) => {
+            query.resolve = resolve;
+            query.reject = reject;
             const poll = () => {
-                if (this.isResultAvailable()) {
-                    resolve(this.getResult());
-                    this._pollingPromise = null;
+                query.pollRequestId = null;
+                if (query.cancelled || this.destroyed) {
+                    this._pendingReads.delete(query);
+                    query.promise = null;
+                    query.resolve = null;
+                    query.reject = null;
+                    resolve(0n);
+                    return;
+                }
+                if (!this._pollQueryAvailability(query)) {
+                    query.pollRequestId = this._requestAnimationFrame(poll);
+                    return;
                 }
-                else if (counter++ > limit) {
-                    reject('Timed out');
-                    this._pollingPromise = null;
+                this._pendingReads.delete(query);
+                query.promise = null;
+                query.resolve = null;
+                query.reject = null;
+                if (query.disjoint) {
+                    reject(new Error('GPU timestamp query was invalidated by a disjoint event'));
                 }
                 else {
-                    requestAnimationFrame(poll);
+                    resolve(query.result || 0n);
                 }
             };
-            requestAnimationFrame(poll);
+            poll();
         });
-        return this._pollingPromise;
+        return query.promise;
+    }
+    _cancelPendingQuery(query) {
+        this._pendingReads.delete(query);
+        query.cancelled = true;
+        if (query.pollRequestId !== null) {
+            this._cancelAnimationFrame(query.pollRequestId);
+            query.pollRequestId = null;
+        }
+        if (query.resolve) {
+            const resolve = query.resolve;
+            query.promise = null;
+            query.resolve = null;
+            query.reject = null;
+            resolve(0n);
+        }
+    }
+    _requestAnimationFrame(callback) {
+        return requestAnimationFrame(callback);
+    }
+    _cancelAnimationFrame(requestId) {
+        cancelAnimationFrame(requestId);
     }
 }
 //# sourceMappingURL=webgl-query-set.js.map

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

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

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

@@ -1,7 +1,7 @@
 import { NumericArray } from '@math.gl/types';
 import { RenderPass, RenderPassProps, RenderPassParameters } from '@luma.gl/core';
 import { WebGLDevice } from "../webgl-device.js";
-import { GLParameters } from '@luma.gl/constants';
+import { GLParameters } from '@luma.gl/webgl/constants';
 export declare class WEBGLRenderPass extends RenderPass {
     readonly device: WebGLDevice;
     readonly handle: null;

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":"AAIA,OAAO,EAAC,YAAY,EAAe,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAQpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAM;gBAEpB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAsCvD,GAAG,IAAI,IAAI;IAKX,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;IAsD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IAkCvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,YAA2B;CA4CtF"}
+{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAe,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAQ1D,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAM;gBAEpB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAkDvD,GAAG,IAAI,IAAI;IAaX,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;IAmD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IAkCvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,YAA2B;CA4CtF"}

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { RenderPass } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GL } from '@luma.gl/webgl/constants';
 import { withGLParameters } from "../../context/state-tracker/with-parameters.js";
 import { setGLParameters } from "../../context/parameters/unified-parameter-api.js";
 const COLOR_CHANNELS = [0x1, 0x2, 0x4, 0x8]; // GPUColorWrite RED, GREEN, BLUE, ALPHA
@@ -14,12 +14,19 @@ export class WEBGLRenderPass extends RenderPass {
     constructor(device, props) {
         super(device, props);
         this.device = device;
+        const webglFramebuffer = this.props.framebuffer;
+        const isDefaultFramebuffer = !webglFramebuffer || webglFramebuffer.handle === null;
+        if (isDefaultFramebuffer) {
+            // Treat an explicit wrapper around the default framebuffer the same as the
+            // implicit default path so draw buffer and viewport state stay valid.
+            device.getDefaultCanvasContext()._resizeDrawingBufferIfNeeded();
+        }
         // If no viewport is provided, apply reasonably defaults
         let viewport;
         if (!props?.parameters?.viewport) {
-            if (props?.framebuffer) {
+            if (!isDefaultFramebuffer) {
                 // Set the viewport to the size of the framebuffer
-                const { width, height } = props.framebuffer;
+                const { width, height } = webglFramebuffer;
                 viewport = [0, 0, width, height];
             }
             else {
@@ -32,21 +39,34 @@ export class WEBGLRenderPass extends RenderPass {
         this.device.pushState();
         this.setParameters({ viewport, ...this.props.parameters });
         // Specify mapping of draw buffer locations to color attachments
-        const webglFramebuffer = this.props.framebuffer;
         // Default framebuffers can only be set to GL.BACK or GL.NONE
-        if (this.props.framebuffer && webglFramebuffer?.handle) {
-            const drawBuffers = this.props.framebuffer.colorAttachments.map((_, i) => 36064 + i);
+        if (!isDefaultFramebuffer) {
+            const drawBuffers = webglFramebuffer.colorAttachments.map((_, i) => 36064 + i);
             this.device.gl.drawBuffers(drawBuffers);
         }
         else {
+            // Default framebuffer only supports GL.BACK/GL.NONE draw buffers, even when
+            // passed through an explicit framebuffer wrapper.
             this.device.gl.drawBuffers([1029]);
         }
         // Hack - for now WebGL draws in "immediate mode" (instead of queueing the operations)...
         this.clear();
+        if (this.props.timestampQuerySet && this.props.beginTimestampIndex !== undefined) {
+            const webglQuerySet = this.props.timestampQuerySet;
+            webglQuerySet.writeTimestamp(this.props.beginTimestampIndex);
+        }
     }
     end() {
+        if (this.destroyed) {
+            return;
+        }
+        if (this.props.timestampQuerySet && this.props.endTimestampIndex !== undefined) {
+            const webglQuerySet = this.props.timestampQuerySet;
+            webglQuerySet.writeTimestamp(this.props.endTimestampIndex);
+        }
         this.device.popState();
         // should add commands to CommandEncoder.
+        this.destroy();
     }
     pushDebugGroup(groupLabel) { }
     popDebugGroup() { }
@@ -88,12 +108,9 @@ export class WEBGLRenderPass extends RenderPass {
         if (parameters.blendConstant) {
             glParameters.blendColor = parameters.blendConstant;
         }
-        if (parameters.stencilReference) {
-            // eslint-disable-next-line no-console
-            console.warn('RenderPassParameters.stencilReference not yet implemented in WebGL');
-            // parameters.stencilFunc = [func, ref, mask];
-            // Does this work?
+        if (parameters.stencilReference !== undefined) {
             glParameters[2967] = parameters.stencilReference;
+            glParameters[36003] = parameters.stencilReference;
         }
         if ('colorMask' in parameters) {
             glParameters.colorMask = COLOR_CHANNELS.map(channel => Boolean(channel & parameters.colorMask));

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,UAAU,EAAwC,MAAM,eAAe,CAAC;AAEhF,OAAO,EAAC,EAAE,EAAe,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,uDAAoD;AAC7E,OAAO,EAAC,eAAe,EAAC,0DAAuD;AAI/E,MAAM,cAAc,GAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,wCAAwC;AAEnG,MAAM,OAAO,eAAgB,SAAQ,UAAU;IACpC,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IAEvB,8DAA8D;IAC9D,YAAY,GAAiB,EAAE,CAAC;IAEhC,YAAY,MAAmB,EAAE,KAAsB;QACrD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,wDAAwD;QACxD,IAAI,QAAkC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;YACjC,IAAI,KAAK,EAAE,WAAW,EAAE,CAAC;gBACvB,kDAAkD;gBAClD,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,KAAK,CAAC,WAAW,CAAC;gBAC1C,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,4FAA4F;gBAC5F,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC,oBAAoB,EAAE,CAAC;gBAChF,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,EAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAC,CAAC,CAAC;QAEzD,gEAAgE;QAChE,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,WAA+B,CAAC;QACpE,6DAA6D;QAC7D,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,gBAAgB,EAAE,MAAM,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAC7D,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAuB,CAAC,CACnC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,MAAS,CAAC,CAAC;QACxC,CAAC;QAED,yFAAyF;QACzF,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,GAAG;QACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACvB,yCAAyC;IAC3C,CAAC;IAED,cAAc,CAAC,UAAkB,IAAS,CAAC;IAC3C,aAAa,KAAU,CAAC;IACxB,iBAAiB,CAAC,WAAmB,IAAS,CAAC;IAE/C,iDAAiD;IACjD,6BAA6B;IAE7B,4DAA4D;IAE5D;;OAEG;IACH,aAAa,CAAC,aAAmC,EAAE;QACjD,MAAM,YAAY,GAAiB,EAAC,GAAG,IAAI,CAAC,YAAY,EAAC,CAAC;QAE1D,uDAAuD;QACvD,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC;QAE1D,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YAC7B,YAAY,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;QACrD,CAAC;QAED,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9D,YAAY,OAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAEzD,yDAAyD;QACzD,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YACxB,+CAA+C;YAC/C,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACpC,YAAY,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC;gBACxE,YAAY,CAAC,UAAU,GAAG;oBACxB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAW;oBAChC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAW;iBACjC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,YAAY,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAwB,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC;YAChC,YAAY,CAAC,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC;QAChD,CAAC;QACD,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;YAC7B,YAAY,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC;QACrD,CAAC;QACD,IAAI,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAChC,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YACnF,8CAA8C;YAC9C,kBAAkB;YAClB,YAAY,MAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC;QAC7D,CAAC;QAED,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;YAC9B,YAAY,CAAC,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CACpD,OAAO,CAAC,OAAO,GAAI,UAAU,CAAC,SAAoB,CAAC,CACpD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;IAED,mBAAmB,CAAC,UAAkB;QACpC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAkC,CAAC;QACpE,aAAa,EAAE,mBAAmB,EAAE,CAAC;IACvC,CAAC;IAEQ,iBAAiB;QACxB,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAkC,CAAC;QACpE,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACrC,CAAC;IAED,UAAU;IAEV;;OAEG;IACO,KAAK;QACb,MAAM,YAAY,GAAiB,EAAC,GAAG,IAAI,CAAC,YAAY,EAAC,CAAC;QAE1D,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;gBACxD,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5E,SAAS,SAAuB,CAAC;YACjC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YACpC,SAAS,OAAuB,CAAC;YACjC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;YACtC,SAAS,QAAyB,CAAC;YACnC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QACtD,CAAC;QAED,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,oDAAoD;YACpD,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;gBAClD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;OAEG;IACO,gBAAgB,CAAC,aAAqB,CAAC,EAAE,QAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACnF,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAC,EAAE,GAAG,EAAE;YAC3E,wCAAwC;YACxC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC;gBAC1B,KAAK,SAAS,CAAC;gBACf,KAAK,UAAU,CAAC;gBAChB,KAAK,UAAU;oBACb,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,OAAW,UAAU,EAAE,KAAK,CAAC,CAAC;oBAC1D,MAAM;gBACR,KAAK,UAAU,CAAC;gBAChB,KAAK,iBAAiB,CAAC;gBACvB,KAAK,WAAW,CAAC;gBACjB,KAAK,WAAW;oBACd,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,OAAW,UAAU,EAAE,KAAK,CAAC,CAAC;oBAC3D,MAAM;gBACR,KAAK,YAAY;oBACf,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,OAAW,UAAU,EAAE,KAAK,CAAC,CAAC;oBAC1D,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAsBF"}
+{"version":3,"file":"webgl-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import type { RenderPipelineProps, RenderPipelineParameters, PrimitiveTopology, ShaderLayout, UniformValue, Binding, RenderPass, VertexArray } from '@luma.gl/core';
+import type { RenderPipelineProps, RenderPipelineParameters, PrimitiveTopology, ShaderLayout, UniformValue, Bindings, BindingsByGroup, RenderPass, VertexArray } from '@luma.gl/core';
 import { RenderPipeline } from '@luma.gl/core';
 import { WebGLDevice } from "../webgl-device.js";
 import { WEBGLShader } from "./webgl-shader.js";
@@ -15,10 +15,10 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
     fs: WEBGLShader;
     /** The layout extracted from shader by WebGL introspection APIs */
     introspectedLayout: ShaderLayout;
-    /** Uniforms set on this model */
+    /** Compatibility path for direct pipeline.setBindings() usage */
+    bindings: Bindings;
+    /** Compatibility path for direct pipeline.uniforms usage */
     uniforms: Record<string, UniformValue>;
-    /** Bindings set on this model */
-    bindings: Record<string, Binding>;
     /** WebGL varyings */
     varyings: string[] | null;
     _uniformCount: number;
@@ -27,10 +27,10 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
     constructor(device: WebGLDevice, props: RenderPipelineProps);
     destroy(): void;
     /**
-     * Bindings include: textures, samplers and uniform buffers
-     * @todo needed for portable model
+     * Compatibility shim for code paths that still set bindings on the pipeline.
+     * Shared-model draws pass bindings per draw and do not rely on this state.
      */
-    setBindings(bindings: Record<string, Binding>, options?: {
+    setBindings(bindings: Bindings | BindingsByGroup, options?: {
         disableWarnings?: boolean;
     }): void;
     /** @todo needed for portable model
@@ -51,30 +51,26 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
         firstInstance?: number;
         baseVertex?: number;
         transformFeedback?: WEBGLTransformFeedback;
+        bindings?: Bindings;
+        bindGroups?: BindingsByGroup;
+        _bindGroupCacheKeys?: Partial<Record<number, object>>;
+        uniforms?: Record<string, UniformValue>;
     }): boolean;
-    protected _linkShaders(): Promise<void>;
-    /** Report link status. First, check for shader compilation failures if linking fails */
-    _reportLinkStatus(status: 'success' | 'link-error' | 'validation-error'): Promise<void>;
-    /**
-     * Get the shader compilation status
-     * TODO - Load log even when no error reported, to catch warnings?
-     * https://gamedev.stackexchange.com/questions/30429/how-to-detect-glsl-warnings
-     */
-    _getLinkStatus(): 'success' | 'link-error' | 'validation-error';
-    /** Use KHR_parallel_shader_compile extension if available */
-    _waitForLinkComplete(): Promise<void>;
     /**
      * Checks if all texture-values uniforms are renderable (i.e. loaded)
      * Update a texture if needed (e.g. from video)
      * Note: This is currently done before every draw call
      */
-    _areTexturesRenderable(): boolean;
+    _areTexturesRenderable(bindings: Bindings): boolean;
     /** Apply any bindings (before each draw call) */
-    _applyBindings(): void;
+    _applyBindings(bindings: Bindings, _options?: {
+        disableWarnings?: boolean;
+    }): void;
     /**
      * Due to program sharing, uniforms need to be reset before every draw call
      * (though caching will avoid redundant WebGL calls)
      */
-    _applyUniforms(): void;
+    _applyUniforms(uniforms: Record<string, UniformValue>): void;
+    private _syncLinkStatus;
 }
 //# sourceMappingURL=webgl-render-pipeline.d.ts.map

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":"AAIA,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,cAAc,EAAM,MAAM,eAAe,CAAC;AASlD,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,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,yCAAyC;IACzC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,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;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IA+BlD,OAAO,IAAI,IAAI;IAaxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IA0D3F;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,UAAU,CAAC,EAAE,wBAAwB,CAAC;QACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;QAC7B,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,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;cAmGK,YAAY;IA2B5B,wFAAwF;IAClF,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,GAAG,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyC7F;;;;OAIG;IACH,cAAc,IAAI,SAAS,GAAG,YAAY,GAAG,kBAAkB;IAmB/D,6DAA6D;IACvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3C;;;;OAIG;IACH,sBAAsB;IAuBtB,iDAAiD;IACjD,cAAc;IAyFd;;;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,EACV,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,eAAe,EACf,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,cAAc,EAAwD,MAAM,eAAe,CAAC;AAQpG,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAK3C,OAAO,EAAC,sBAAsB,EAAC,sCAAmC;AAIlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,yCAAyC;IACzC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iEAAiE;IACjE,QAAQ,EAAE,QAAQ,CAAM;IACxB,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAwBlD,OAAO,IAAI,IAAI;IAUxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,EAAE,OAAO,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAmD9F;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,UAAU,CAAC,EAAE,wBAAwB,CAAC;QACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;QAC7B,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,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;QAC3C,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KACzC,GAAG,OAAO;IAoGX;;;;OAIG;IACH,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAoBzC,iDAAiD;IACjD,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC;IAsFzE;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAUrD,OAAO,CAAC,eAAe;CAGxB"}