@luma.gl/webgl 9.3.0-alpha.4 → 9.3.0-alpha.8

package/dist/adapter/resources/webgl-command-encoder.js

@@ -11,16 +11,25 @@ export class WEBGLCommandEncoder extends CommandEncoder {
     constructor(device, props) {
         super(device, props);
         this.device = device;
-        this.commandBuffer = new WEBGLCommandBuffer(device);
-    }
-    destroy() { }
-    finish() {
+        this.commandBuffer = new WEBGLCommandBuffer(device, {
+            id: `${this.props.id}-command-buffer`
+        });
+    }
+    destroy() {
+        this.destroyResource();
+    }
+    finish(props) {
+        if (props?.id && this.commandBuffer.id !== props.id) {
+            this.commandBuffer.id = props.id;
+            this.commandBuffer.props.id = props.id;
+        }
+        this.destroy();
         return this.commandBuffer;
     }
-    beginRenderPass(props) {
-        return new WEBGLRenderPass(this.device, props);
+    beginRenderPass(props = {}) {
+        return new WEBGLRenderPass(this.device, this._applyTimeProfilingToPassProps(props));
     }
-    beginComputePass(props) {
+    beginComputePass(props = {}) {
         throw new Error('ComputePass not supported in WebGL');
     }
     copyBufferToBuffer(options) {
@@ -41,6 +50,12 @@ export class WEBGLCommandEncoder extends CommandEncoder {
     pushDebugGroup(groupLabel) { }
     popDebugGroup() { }
     insertDebugMarker(markerLabel) { }
-    resolveQuerySet(querySet, destination, options) { }
+    resolveQuerySet(_querySet, _destination, _options) {
+        throw new Error('resolveQuerySet is not supported in WebGL');
+    }
+    writeTimestamp(querySet, queryIndex) {
+        const webglQuerySet = querySet;
+        webglQuerySet.writeTimestamp(queryIndex);
+    }
 }
 //# sourceMappingURL=webgl-command-encoder.js.map

package/dist/adapter/resources/webgl-command-encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-command-encoder.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,cAAc,EAAsB,MAAM,eAAe,CAAC;AAelE,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AAGpD,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IAC5C,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IAEd,aAAa,CAAqB;IAE3C,YAAY,MAAmB,EAAE,KAA0B;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAEQ,OAAO,KAAU,CAAC;IAElB,MAAM;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,KAAsB;QACpC,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB,CAAC,KAAuB;QACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,OAAkC;QACnD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC7E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oBAAoB,CAAC,OAAoC;QACvD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC/E,CAAC;IAED,qDAAqD;IACrD,kFAAkF;IAClF,IAAI;IAEK,cAAc,CAAC,UAAkB,IAAS,CAAC;IAC3C,aAAa,KAAI,CAAC;IAElB,iBAAiB,CAAC,WAAmB,IAAS,CAAC;IAE/C,eAAe,CACtB,QAAkB,EAClB,WAAmB,EACnB,OAIC,IACM,CAAC;CACX"}
+{"version":3,"file":"webgl-command-encoder.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAqB,cAAc,EAAsB,MAAM,eAAe,CAAC;AAetF,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AAIpD,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IAC5C,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IAEd,aAAa,CAAqB;IAE3C,YAAY,MAAmB,EAAE,KAA0B;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAClD,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,iBAAiB;SACtC,CAAC,CAAC;IACL,CAAC;IAEQ,OAAO;QACd,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEQ,MAAM,CAAC,KAA0B;QACxC,IAAI,KAAK,EAAE,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,QAAyB,EAAE;QACzC,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,gBAAgB,CAAC,QAA0B,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,OAAkC;QACnD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC7E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oBAAoB,CAAC,OAAoC;QACvD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC/E,CAAC;IAED,qDAAqD;IACrD,kFAAkF;IAClF,IAAI;IAEK,cAAc,CAAC,UAAkB,IAAS,CAAC;IAC3C,aAAa,KAAI,CAAC;IAElB,iBAAiB,CAAC,WAAmB,IAAS,CAAC;IAE/C,eAAe,CACtB,SAAmB,EACnB,YAAoB,EACpB,QAIC;QAED,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,cAAc,CAAC,QAAkB,EAAE,UAAkB;QACnD,MAAM,aAAa,GAAG,QAAyB,CAAC;QAChD,aAAa,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;CACF"}

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

@@ -1,6 +1,6 @@
 import type { FramebufferProps } from '@luma.gl/core';
 import { Framebuffer } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GL } from '@luma.gl/webgl/constants';
 import { WebGLDevice } from "../webgl-device.js";
 import { WEBGLTexture } from "./webgl-texture.js";
 import { WEBGLTextureView } from "./webgl-texture-view.js";
@@ -24,6 +24,8 @@ export declare class WEBGLFramebuffer extends Framebuffer {
      * @param level = 0 - mipmapLevel
      */
     protected _attachTextureView(attachment: GL, textureView: WEBGLTextureView): void;
+    /** Default framebuffer resize is managed by canvas size and should be a no-op. */
+    protected resizeAttachments(width: number, height: number): void;
 }
 /**
  * Attachment resize is expected to be a noop if size is same

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAGtD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,YAAY,CAAC;AAEzD,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,EAAE,EAAE,sBAAsB,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAElC,gBAAgB,EAAE,gBAAgB,EAAE,CAAM;IAC1C,sBAAsB,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAE3C,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAsBxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAQxB,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAqCnC,mGAAmG;IAYnG;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;CA8BlF;AAqCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BE"}
+{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAGtD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,YAAY,CAAC;AAEzD,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,EAAE,EAAE,sBAAsB,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAElC,gBAAgB,EAAE,gBAAgB,EAAE,CAAM;IAC1C,sBAAsB,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAE3C,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAsBxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAQxB,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAqCnC,mGAAmG;IAYnG;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;IA+BjF,kFAAkF;cAC/D,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAS1E;AAqCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BE"}

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Framebuffer } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GL } from '@luma.gl/webgl/constants';
 import { getDepthStencilAttachmentWebGL } from "../converters/webgl-texture-table.js";
 /** luma.gl Framebuffer, WebGL implementation  */
 export class WEBGLFramebuffer extends Framebuffer {
@@ -102,6 +102,15 @@ export class WEBGLFramebuffer extends Framebuffer {
         }
         gl.bindTexture(texture.glTarget, null);
     }
+    /** Default framebuffer resize is managed by canvas size and should be a no-op. */
+    resizeAttachments(width, height) {
+        if (this.handle === null) {
+            this.width = width;
+            this.height = height;
+            return;
+        }
+        super.resizeAttachments(width, height);
+    }
 }
 // Helper functions
 // Map an index to a cube map face constant

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

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

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

@@ -1,44 +1,50 @@
 import { QuerySet, QuerySetProps } from '@luma.gl/core';
 import { WebGLDevice } from "../webgl-device.js";
+type WebGLPendingQuery = {
+    handle: WebGLQuery;
+    promise: Promise<bigint> | null;
+    result: bigint | null;
+    disjoint: boolean;
+    cancelled: boolean;
+    pollRequestId: number | null;
+    resolve: ((value: bigint) => void) | null;
+    reject: ((error: Error) => void) | null;
+};
+type WebGLTimestampPair = {
+    activeQuery: WebGLPendingQuery | null;
+    completedQueries: WebGLPendingQuery[];
+};
 /**
  * Asynchronous queries for different kinds of information
  */
 export declare class WEBGLQuerySet extends QuerySet {
     readonly device: WebGLDevice;
-    readonly handle: WebGLQuery;
-    target: number | null;
-    _queryPending: boolean;
-    _pollingPromise: Promise<any> | null;
+    readonly handle: WebGLQuery | null;
+    protected _timestampPairs: WebGLTimestampPair[];
+    protected _pendingReads: Set<WebGLPendingQuery>;
+    protected _occlusionQuery: WebGLPendingQuery | null;
+    protected _occlusionActive: boolean;
     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;
+    isResultAvailable(queryIndex?: number): boolean;
+    readResults(options?: {
+        firstQuery?: number;
+        queryCount?: number;
+    }): Promise<bigint[]>;
+    readTimestampDuration(beginIndex: number, endIndex: number): Promise<number>;
+    beginOcclusionQuery(): 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>;
+    writeTimestamp(queryIndex: number): void;
+    protected _validateRange(firstQuery: number, queryCount: number): void;
+    protected _getTimestampPairIndex(queryIndex: number): number;
+    protected _isTimestampPairAvailable(pairIndex: number): boolean;
+    protected _pollQueryAvailability(query: WebGLPendingQuery): boolean;
+    protected _consumeTimestampPairResult(pairIndex: number): Promise<bigint>;
+    protected _consumeQueryResult(query: WebGLPendingQuery): Promise<bigint>;
+    protected _cancelPendingQuery(query: WebGLPendingQuery): void;
+    protected _requestAnimationFrame(callback: FrameRequestCallback): number;
+    protected _cancelAnimationFrame(requestId: number): void;
 }
+export {};
 //# sourceMappingURL=webgl-query-set.d.ts.map

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

@@ -1 +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,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAE5B,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;IAgB5C,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"}
+{"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,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1C,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAEnC,SAAS,CAAC,eAAe,EAAE,kBAAkB,EAAE,CAAM;IACrD,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAa;IAC5D,SAAS,CAAC,eAAe,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAC3D,SAAS,CAAC,gBAAgB,UAAS;IAEnC,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa;IA0B5C,OAAO,IAAI,IAAI;IAgCxB,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO;IAiBzC,WAAW,CAAC,OAAO,CAAC,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiCpF,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelF,mBAAmB,IAAI,IAAI;IAyB3B,iBAAiB,IAAI,IAAI;IASzB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA2CxC,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAMtE,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAQ5D,SAAS,CAAC,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAS/D,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;cA0BnD,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAe/E,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IA4CxE,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAgB7D,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,MAAM;IAIxE,SAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAGzD"}

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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"}