npm - @luma.gl/webgpu - Versions diffs - 9.3.0-alpha.4 → 9.3.0-alpha.6 - Mend

@luma.gl/webgpu 9.3.0-alpha.4 → 9.3.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (93) hide show

package/dist/adapter/resources/webgpu-query-set.js CHANGED Viewed

@@ -1,13 +1,19 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { QuerySet } from '@luma.gl/core';
+import { Buffer, QuerySet } from '@luma.gl/core';
+import { getCpuHotspotSubmitReason, setCpuHotspotSubmitReason } from "../helpers/cpu-hotspot-profiler.js";
 /**
  * Immutable
  */
 export class WebGPUQuerySet extends QuerySet {
     device;
     handle;
+    _resolveBuffer = null;
+    _readBuffer = null;
+    _cachedResults = null;
+    _readResultsPromise = null;
+    _resultsPendingResolution = false;
     constructor(device, props) {
         super(device, props);
         this.device = device;
@@ -20,9 +26,144 @@ export class WebGPUQuerySet extends QuerySet {
         this.handle.label = this.props.id;
     }
     destroy() {
-        this.handle?.destroy();
-        // @ts-expect-error readonly
-        this.handle = null;
+        if (!this.destroyed) {
+            this.handle?.destroy();
+            this.destroyResource();
+            // @ts-expect-error readonly
+            this.handle = null;
+        }
+    }
+    isResultAvailable(queryIndex) {
+        if (!this._cachedResults) {
+            return false;
+        }
+        return queryIndex === undefined
+            ? true
+            : queryIndex >= 0 && queryIndex < this._cachedResults.length;
+    }
+    async readResults(options) {
+        const firstQuery = options?.firstQuery || 0;
+        const queryCount = options?.queryCount || this.props.count - firstQuery;
+        if (firstQuery < 0 || queryCount < 0 || firstQuery + queryCount > this.props.count) {
+            throw new Error('Query read range is out of bounds');
+        }
+        let needsFreshResults = true;
+        while (needsFreshResults) {
+            if (!this._readResultsPromise) {
+                this._readResultsPromise = this._readAllResults();
+            }
+            const readResultsPromise = this._readResultsPromise;
+            const results = await readResultsPromise;
+            // A later submit may have invalidated the query set while this read was in flight.
+            // Retry so each caller observes the freshest resolved results instead of stale data.
+            needsFreshResults = this._resultsPendingResolution;
+            if (!needsFreshResults) {
+                return results.slice(firstQuery, firstQuery + queryCount);
+            }
+        }
+        throw new Error('Query read unexpectedly failed to resolve');
+    }
+    async readTimestampDuration(beginIndex, endIndex) {
+        if (this.props.type !== 'timestamp') {
+            throw new Error('Timestamp durations require a timestamp QuerySet');
+        }
+        if (beginIndex < 0 || endIndex <= beginIndex || endIndex >= this.props.count) {
+            throw new Error('Timestamp duration range is out of bounds');
+        }
+        const results = await this.readResults({
+            firstQuery: beginIndex,
+            queryCount: endIndex - beginIndex + 1
+        });
+        return Number(results[results.length - 1] - results[0]) / 1e6;
+    }
+    /** Marks any cached query results as stale after new writes have been encoded. */
+    _invalidateResults() {
+        this._cachedResults = null;
+        this._resultsPendingResolution = true;
+    }
+    async _readAllResults() {
+        this._ensureBuffers();
+        try {
+            // Use a dedicated encoder so async profiling reads cannot flush or replace the
+            // device's active frame encoder while application rendering is in flight.
+            if (this._resultsPendingResolution) {
+                const commandEncoder = this.device.createCommandEncoder({
+                    id: `${this.id}-read-results`
+                });
+                commandEncoder.resolveQuerySet(this, this._resolveBuffer);
+                commandEncoder.copyBufferToBuffer({
+                    sourceBuffer: this._resolveBuffer,
+                    destinationBuffer: this._readBuffer,
+                    size: this._resolveBuffer.byteLength
+                });
+                const commandBuffer = commandEncoder.finish({
+                    id: `${this.id}-read-results-command-buffer`
+                });
+                const previousSubmitReason = getCpuHotspotSubmitReason(this.device) || undefined;
+                setCpuHotspotSubmitReason(this.device, 'query-readback');
+                try {
+                    this.device.submit(commandBuffer);
+                }
+                finally {
+                    setCpuHotspotSubmitReason(this.device, previousSubmitReason);
+                }
+            }
+            const data = await this._readBuffer.readAsync(0, this._readBuffer.byteLength);
+            const resultView = new BigUint64Array(data.buffer, data.byteOffset, this.props.count);
+            this._cachedResults = Array.from(resultView, value => value);
+            this._resultsPendingResolution = false;
+            return this._cachedResults;
+        }
+        finally {
+            this._readResultsPromise = null;
+        }
+    }
+    _ensureBuffers() {
+        if (this._resolveBuffer && this._readBuffer) {
+            return;
+        }
+        const byteLength = this.props.count * 8;
+        this._resolveBuffer = this.device.createBuffer({
+            id: `${this.id}-resolve-buffer`,
+            usage: Buffer.QUERY_RESOLVE | Buffer.COPY_SRC,
+            byteLength
+        });
+        this.attachResource(this._resolveBuffer);
+        this._readBuffer = this.device.createBuffer({
+            id: `${this.id}-read-buffer`,
+            usage: Buffer.COPY_DST | Buffer.MAP_READ,
+            byteLength
+        });
+        this.attachResource(this._readBuffer);
+    }
+    _encodeResolveToReadBuffer(commandEncoder, options) {
+        if (!this._resultsPendingResolution) {
+            return false;
+        }
+        // If a readback is already mapping the shared read buffer, defer to the fallback read path.
+        // That path will submit resolve/copy commands once the current read has completed.
+        if (this._readResultsPromise) {
+            return false;
+        }
+        this._ensureBuffers();
+        const firstQuery = options?.firstQuery || 0;
+        const queryCount = options?.queryCount || this.props.count - firstQuery;
+        const byteLength = queryCount * BigUint64Array.BYTES_PER_ELEMENT;
+        const byteOffset = firstQuery * BigUint64Array.BYTES_PER_ELEMENT;
+        commandEncoder.resolveQuerySet(this, this._resolveBuffer, {
+            firstQuery,
+            queryCount,
+            destinationOffset: byteOffset
+        });
+        commandEncoder.copyBufferToBuffer({
+            sourceBuffer: this._resolveBuffer,
+            sourceOffset: byteOffset,
+            destinationBuffer: this._readBuffer,
+            destinationOffset: byteOffset,
+            size: byteLength
+        });
+        this._resultsPendingResolution = false;
+        return true;
     }
 }
 //# sourceMappingURL=webgpu-query-set.js.map

package/dist/adapter/resources/webgpu-query-set.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,QAAQ,EAAgB,MAAM,eAAe,CAAC;~~AAQtD~~;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,QAAQ;IACjC,MAAM,CAAe;IACrB,MAAM,CAAc;~~IAE7B~~,YAAY,MAAoB,EAAE,KAAoB;QACpD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM;YACT,IAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBACrB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;iBACxB,CAAC,CAAC;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;~~QACvB~~,4BAA4B;~~QAC5B~~,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;~~IACrB~~,CAAC;CACF"}
1	+ {"version":3,"file":"webgpu-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"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"}

package/dist/adapter/resources/webgpu-render-pass.d.ts CHANGED Viewed

@@ -6,8 +6,11 @@ import { WebGPUFramebuffer } from "./webgpu-framebuffer.js";
 export declare class WebGPURenderPass extends RenderPass {
     readonly device: WebGPUDevice;
     readonly handle: GPURenderPassEncoder;
+    readonly framebuffer: WebGPUFramebuffer;
     /** Active pipeline */
     pipeline: WebGPURenderPipeline | null;
+    /** Latest bindings applied to this pass */
+    bindings: Record<string, Binding>;
     constructor(device: WebGPUDevice, props?: RenderPassProps);
     destroy(): void;
     end(): void;

package/dist/adapter/resources/webgpu-render-pass.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAM,MAAM,eAAe,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;~~AAEvD~~,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;~~IAEtC~~,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;~~gBAEjC~~,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,eAAoB;~~IAyCpD~~,OAAO,IAAI,IAAI;~~IAExB~~,GAAG,IAAI,IAAI;~~IAIX~~,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAQpD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,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;KACrB,GAAG,IAAI;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}
1	+ {"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAM,MAAM,eAAe,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAGvD,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAExC,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE7C,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;gBAE3B,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,eAAoB;IA8EpD,OAAO,IAAI,IAAI;IAIxB,GAAG,IAAI,IAAI;IAQX,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAQpD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,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;KACrB,GAAG,IAAI;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}

package/dist/adapter/resources/webgpu-render-pass.js CHANGED Viewed

@@ -2,48 +2,92 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { RenderPass, log } from '@luma.gl/core';
+import { getCpuHotspotProfiler, getTimestamp } from "../helpers/cpu-hotspot-profiler.js";
 export class WebGPURenderPass extends RenderPass {
     device;
     handle;
+    framebuffer;
     /** Active pipeline */
     pipeline = null;
+    /** Latest bindings applied to this pass */
+    bindings = {};
     constructor(device, props = {}) {
         super(device, props);
         this.device = device;
-        const framebuffer = props.framebuffer || device.getCanvasContext().getCurrentFramebuffer();
-        const renderPassDescriptor = this.getRenderPassDescriptor(framebuffer);
-        const webgpuQuerySet = props.timestampQuerySet;
-        if (webgpuQuerySet) {
-            renderPassDescriptor.occlusionQuerySet = webgpuQuerySet.handle;
+        const { props: renderPassProps } = this;
+        this.framebuffer =
+            renderPassProps.framebuffer ||
+                device.getCanvasContext().getCurrentFramebuffer();
+        const profiler = getCpuHotspotProfiler(this.device);
+        if (profiler) {
+            const counterName = renderPassProps.framebuffer
+                ? 'explicitFramebufferRenderPassCount'
+                : 'defaultFramebufferRenderPassCount';
+            profiler[counterName] = (profiler[counterName] || 0) + 1;
         }
-        if (device.features.has('timestamp-query')) {
-            const webgpuTSQuerySet = props.timestampQuerySet;
-            renderPassDescriptor.timestampWrites = webgpuTSQuerySet
-                ? {
-                    querySet: webgpuTSQuerySet.handle,
-                    beginningOfPassWriteIndex: props.beginTimestampIndex,
-                    endOfPassWriteIndex: props.endTimestampIndex
-                }
-                : undefined;
+        const startTime = profiler ? getTimestamp() : 0;
+        try {
+            const descriptorAssemblyStartTime = profiler ? getTimestamp() : 0;
+            const renderPassDescriptor = this.getRenderPassDescriptor(this.framebuffer);
+            if (renderPassProps.occlusionQuerySet) {
+                renderPassDescriptor.occlusionQuerySet = renderPassProps.occlusionQuerySet.handle;
+            }
+            if (renderPassProps.timestampQuerySet) {
+                const webgpuTSQuerySet = renderPassProps.timestampQuerySet;
+                webgpuTSQuerySet?._invalidateResults();
+                renderPassDescriptor.timestampWrites = webgpuTSQuerySet
+                    ? {
+                        querySet: webgpuTSQuerySet.handle,
+                        beginningOfPassWriteIndex: renderPassProps.beginTimestampIndex,
+                        endOfPassWriteIndex: renderPassProps.endTimestampIndex
+                    }
+                    : undefined;
+            }
+            if (profiler) {
+                profiler.renderPassDescriptorAssemblyCount =
+                    (profiler.renderPassDescriptorAssemblyCount || 0) + 1;
+                profiler.renderPassDescriptorAssemblyTimeMs =
+                    (profiler.renderPassDescriptorAssemblyTimeMs || 0) +
+                        (getTimestamp() - descriptorAssemblyStartTime);
+            }
+            if (!device.commandEncoder) {
+                throw new Error('commandEncoder not available');
+            }
+            this.device.pushErrorScope('validation');
+            const beginRenderPassStartTime = profiler ? getTimestamp() : 0;
+            this.handle =
+                this.props.handle || device.commandEncoder.handle.beginRenderPass(renderPassDescriptor);
+            if (profiler) {
+                profiler.renderPassBeginCount = (profiler.renderPassBeginCount || 0) + 1;
+                profiler.renderPassBeginTimeMs =
+                    (profiler.renderPassBeginTimeMs || 0) + (getTimestamp() - beginRenderPassStartTime);
+            }
+            this.device.popErrorScope((error) => {
+                this.device.reportError(new Error(`${this} creation failed:\n"${error.message}"`), this)();
+                this.device.debug();
+            });
+            this.handle.label = this.props.id;
+            log.groupCollapsed(3, `new WebGPURenderPass(${this.id})`)();
+            log.probe(3, JSON.stringify(renderPassDescriptor, null, 2))();
+            log.groupEnd(3)();
         }
-        if (!device.commandEncoder) {
-            throw new Error('commandEncoder not available');
+        finally {
+            if (profiler) {
+                profiler.renderPassSetupCount = (profiler.renderPassSetupCount || 0) + 1;
+                profiler.renderPassSetupTimeMs =
+                    (profiler.renderPassSetupTimeMs || 0) + (getTimestamp() - startTime);
+            }
         }
-        this.device.pushErrorScope('validation');
-        this.handle =
-            this.props.handle || device.commandEncoder.handle.beginRenderPass(renderPassDescriptor);
-        this.device.popErrorScope((error) => {
-            this.device.reportError(new Error(`${this} creation failed:\n"${error.message}"`), this)();
-            this.device.debug();
-        });
-        this.handle.label = this.props.id;
-        log.groupCollapsed(3, `new WebGPURenderPass(${this.id})`)();
-        log.probe(3, JSON.stringify(renderPassDescriptor, null, 2))();
-        log.groupEnd(3)();
     }
-    destroy() { }
+    destroy() {
+        this.destroyResource();
+    }
     end() {
+        if (this.destroyed) {
+            return;
+        }
         this.handle.end();
+        this.destroy();
     }
     setPipeline(pipeline) {
         this.pipeline = pipeline;
@@ -56,8 +100,8 @@ export class WebGPURenderPass extends RenderPass {
     }
     /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
     setBindings(bindings) {
-        this.pipeline?.setBindings(bindings);
-        const bindGroup = this.pipeline?._getBindGroup();
+        this.bindings = bindings;
+        const bindGroup = this.pipeline?._getBindGroup(bindings);
         if (bindGroup) {
             this.handle.setBindGroup(0, bindGroup);
         }

package/dist/adapter/resources/webgpu-render-pass.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAS,UAAU,EAAkB,GAAG,EAAC,MAAM,eAAe,CAAC;~~AAQtE~~,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IACrC,MAAM,CAAe;IACrB,MAAM,CAAuB;~~IAEtC~~,sBAAsB;IACtB,QAAQ,GAAgC,IAAI,CAAC;IAE7C,YAAY,MAAoB,EAAE,QAAyB,EAAE;QAC3D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,~~WAAW~~,~~GACd,~~KAAK,CAAC,WAAiC,~~IAAI,~~MAAM,CAAC,gBAAgB,EAAE,CAAC,qBAAqB,EAAE,CAAC;~~QAEhG~~,MAAM,~~oBAAoB~~,GAAG,IAAI,CAAC,~~uBAAuB~~,CAAC,WAAW,CAAC,CAAC;~~QAEvE~~,MAAM,~~cAAc~~,GAAG,~~KAAK~~,CAAC,~~iBAAmC~~,CAAC;~~QACjE~~,IAAI,~~cAAc~~,EAAE,CAAC;~~YACnB~~,oBAAoB,CAAC,~~iBAAiB~~,~~GAAG~~,~~cAAc~~,CAAC,~~MAAM~~,CAAC~~;QACjE~~,CAAC;~~QAED~~,IAAI,~~MAAM~~,CAAC,~~QAAQ~~,CAAC,~~GAAG~~,CAAC,iBAAiB,CAAC,EAAE,CAAC;~~YAC3C~~,MAAM,gBAAgB,GAAG,~~KAAK~~,CAAC,iBAAmC,CAAC;~~YACnE~~,oBAAoB,CAAC,eAAe,GAAG,gBAAgB;~~gBACrD~~,CAAC,CAAE;~~oBACC~~,QAAQ,EAAE,gBAAgB,CAAC,MAAM;~~oBACjC~~,yBAAyB,EAAE,~~KAAK~~,CAAC,mBAAmB;~~oBACpD~~,mBAAmB,EAAE,~~KAAK~~,CAAC,iBAAiB;~~iBACX~~;~~gBACrC~~,CAAC,CAAC,SAAS,CAAC;~~QAChB~~,CAAC;~~QAED~~,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;~~YAC3B~~,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;~~QAClD~~,CAAC;~~QAED~~,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;~~QACzC~~,IAAI,CAAC,MAAM;~~YACT~~,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;~~QAC1F~~,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;~~YAC5C~~,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;~~YAC3F~~,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;~~QACtB~~,CAAC,CAAC,CAAC;~~QACH~~,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;~~QAClC~~,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,wBAAwB,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;~~QAC5D~~,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~QAC9D~~,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;~~IACpB~~,CAAC;IAEQ,OAAO,~~KAAU~~,CAAC;~~IAE3B~~,GAAG;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;~~IACpB~~,CAAC;IAED,WAAW,CAAC,QAAwB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAgC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,0BAA0B,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,2EAA2E;IAC3E,WAAW,CAAC,QAAiC;QAC3C,IAAI,CAAC,QAAQ,~~EAAE~~,~~WAAW,CAAC,~~QAAQ,CAAC~~,CAAC~~;~~QACrC~~,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,aAAa,~~EAAE~~,CAAC;~~QACjD~~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"}
1	+ {"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"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"}

package/dist/adapter/resources/webgpu-render-pipeline.d.ts CHANGED Viewed

@@ -8,16 +8,17 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
     readonly handle: GPURenderPipeline;
     readonly vs: WebGPUShader;
     readonly fs: WebGPUShader | null;
-    /** For internal use to create BindGroups */
+    /** Compatibility path for direct pipeline.setBindings() usage */
     private _bindings;
+    /** For internal use to create BindGroups */
     private _bindGroupLayout;
     private _bindGroup;
     get [Symbol.toStringTag](): string;
     constructor(device: WebGPUDevice, props: RenderPipelineProps);
     destroy(): void;
     /**
-     * @todo Use renderpass.setBindings() ?
-     * @todo Do we want to expose BindGroups in the API and remove this?
+     * Compatibility shim for code paths that still set bindings on the pipeline.
+     * The shared-model path passes bindings per draw and does not rely on this state.
      */
     setBindings(bindings: Record<string, Binding>): void;
     /** @todo - should this be moved to renderpass? */
@@ -31,9 +32,11 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
         firstIndex?: number;
         firstInstance?: number;
         baseVertex?: number;
+        bindings?: Record<string, Binding>;
+        uniforms?: Record<string, unknown>;
     }): boolean;
     /** Return a bind group created by setBindings */
-    _getBindGroup(): GPUBindGroup | null;
+    _getBindGroup(bindings?: Record<string, Binding>): GPUBindGroup | null;
     /**
      * Populate the complex WebGPU GPURenderPipelineDescriptor
      */

package/dist/adapter/resources/webgpu-render-pipeline.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAM,MAAM,eAAe,CAAC;AASvE,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;~~AAKlD~~,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,~~4CAA4C~~;~~IAC5C~~,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;~~IA0BnD~~,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;~~IAUpD~~,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,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;~~KACrB~~,GAAG,OAAO;~~IA4CX~~,iDAAiD;IACjD,aAAa;~~IAiBb~~;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAsDvC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
1	+ {"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAM,MAAM,eAAe,CAAC;AASvE,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAOlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,iEAAiE;IACjE,OAAO,CAAC,SAAS,CAA0B;IAC3C,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAyBnD,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAkBpD,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,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,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,GAAG,OAAO;IA+CX,iDAAiD;IACjD,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmBhD;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAsDvC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}

package/dist/adapter/resources/webgpu-render-pipeline.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { applyParametersToRenderPipelineDescriptor } from "../helpers/webgpu-par
 import { getWebGPUTextureFormat } from "../helpers/convert-texture-format.js";
 import { getBindGroup } from "../helpers/get-bind-group.js";
 import { getVertexBufferLayout } from "../helpers/get-vertex-buffer-layout.js";
+const EMPTY_BINDINGS = {};
 // RENDER PIPELINE
 /** Creates a new render pipeline when parameters change */
 export class WebGPURenderPipeline extends RenderPipeline {
@@ -11,8 +12,9 @@ export class WebGPURenderPipeline extends RenderPipeline {
     handle;
     vs;
     fs = null;
-    /** For internal use to create BindGroups */
+    /** Compatibility path for direct pipeline.setBindings() usage */
     _bindings;
+    /** For internal use to create BindGroups */
     _bindGroupLayout = null;
     _bindGroup = null;
     get [Symbol.toStringTag]() {
@@ -38,7 +40,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
         // Note: Often the same shader in WebGPU
         this.vs = props.vs;
         this.fs = props.fs;
-        this._bindings = { ...this.props.bindings };
+        this._bindings = props.bindings || EMPTY_BINDINGS;
     }
     destroy() {
         // WebGPURenderPipeline has no destroy method.
@@ -46,21 +48,30 @@ export class WebGPURenderPipeline extends RenderPipeline {
         this.handle = null;
     }
     /**
-     * @todo Use renderpass.setBindings() ?
-     * @todo Do we want to expose BindGroups in the API and remove this?
+     * Compatibility shim for code paths that still set bindings on the pipeline.
+     * The shared-model path passes bindings per draw and does not rely on this state.
      */
     setBindings(bindings) {
-        // Invalidate the cached bind group if any value has changed
+        let bindingsChanged = false;
         for (const [name, binding] of Object.entries(bindings)) {
             if (this._bindings[name] !== binding) {
-                this._bindGroup = null;
+                if (!bindingsChanged) {
+                    if (this._bindings === this.props.bindings || this._bindings === EMPTY_BINDINGS) {
+                        this._bindings = { ...this._bindings };
+                    }
+                    bindingsChanged = true;
+                }
+                this._bindings[name] = binding;
             }
         }
-        Object.assign(this._bindings, bindings);
+        if (bindingsChanged) {
+            this._bindGroup = null;
+        }
     }
     /** @todo - should this be moved to renderpass? */
     draw(options) {
         const webgpuRenderPass = options.renderPass;
+        const instanceCount = options.instanceCount && options.instanceCount > 0 ? options.instanceCount : 1;
         // Set pipeline
         this.device.pushErrorScope('validation');
         webgpuRenderPass.handle.setPipeline(this.handle);
@@ -69,7 +80,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
             this.device.debug();
         });
         // Set bindings (uniform buffers, textures etc)
-        const bindGroup = this._getBindGroup();
+        const bindGroup = this._getBindGroup(options.bindings);
         if (bindGroup) {
             webgpuRenderPass.handle.setBindGroup(0, bindGroup);
         }
@@ -78,28 +89,28 @@ export class WebGPURenderPipeline extends RenderPipeline {
         options.vertexArray.bindBeforeRender(options.renderPass);
         // Draw
         if (options.indexCount) {
-            webgpuRenderPass.handle.drawIndexed(options.indexCount, options.instanceCount, options.firstIndex, options.baseVertex, options.firstInstance);
+            webgpuRenderPass.handle.drawIndexed(options.indexCount, instanceCount, options.firstIndex || 0, options.baseVertex || 0, options.firstInstance || 0);
         }
         else {
-            webgpuRenderPass.handle.draw(options.vertexCount || 0, options.instanceCount || 1, // If 0, nothing will be drawn
-            options.firstInstance);
+            webgpuRenderPass.handle.draw(options.vertexCount || 0, instanceCount, options.firstVertex || 0, options.firstInstance || 0);
         }
         // Note: Rebinds constant attributes before each draw call
         options.vertexArray.unbindAfterRender(options.renderPass);
         return true;
     }
     /** Return a bind group created by setBindings */
-    _getBindGroup() {
+    _getBindGroup(bindings) {
         if (this.shaderLayout.bindings.length === 0) {
             return null;
         }
         // Get hold of the bind group layout. We don't want to do this unless we know there is at least one bind group
         this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);
-        // Set up the bindings
-        // TODO what if bindings change? We need to rebuild the bind group!
+        if (bindings) {
+            return getBindGroup(this.device, this._bindGroupLayout, this.shaderLayout, bindings);
+        }
         this._bindGroup =
             this._bindGroup ||
-                getBindGroup(this.device.handle, this._bindGroupLayout, this.shaderLayout, this._bindings);
+                getBindGroup(this.device, this._bindGroupLayout, this.shaderLayout, this._bindings);
         return this._bindGroup;
     }
     /**

package/dist/adapter/resources/webgpu-render-pipeline.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-render-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAGtB,OAAO,EAAC,cAAc,EAAuB,GAAG,EAAC,MAAM,eAAe,CAAC;AACvE,OAAO,EAAC,yCAAyC,EAAC,wCAAqC;AACvF,OAAO,EAAC,sBAAsB,EAAC,6CAA0C;AACzE,OAAO,EAAC,YAAY,EAAC,qCAAkC;AACvD,OAAO,EAAC,qBAAqB,EAAC,+CAA4C;AAU1E,kBAAkB;AAElB,2DAA2D;AAC3D,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IAC7C,MAAM,CAAe;IACrB,MAAM,CAAoB;IAE1B,EAAE,CAAe;IACjB,EAAE,GAAwB,IAAI,CAAC;IAExC,~~4CAA4C~~;~~IACpC~~,SAAS,CAA0B;~~IACnC~~,gBAAgB,GAA8B,IAAI,CAAC;IACnD,UAAU,GAAwB,IAAI,CAAC;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,YAAY,MAAoB,EAAE,KAA0B;QAC1D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAA2B,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,UAAU,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACvD,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,4BAA4B,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAElB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAElC,wCAAwC;QACxC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;QACnC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;~~QAEnC~~,IAAI,CAAC,SAAS,GAAG,~~EAAC,GAAG,IAAI,CAAC,~~KAAK,CAAC,QAAQ,~~EAAC~~,CAAC;~~IAC5C~~,CAAC;IAEQ,OAAO;QACd,8CAA8C;QAC9C,mBAAmB;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,QAAiC;QAC3C,~~4DAA4D~~;~~QAC5D~~,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,~~UAAU~~,GAAG,IAAI,CAAC;~~YACzB~~,CAAC;~~QACH~~,CAAC;~~QACD~~,~~MAAM~~,CAAC,~~MAAM~~,CAAC,IAAI,CAAC,~~SAAS~~,EAAE,~~QAAQ~~,CAAC,CAAC;~~IAC1C~~,CAAC;IAED,kDAAkD;IAClD,IAAI,CAAC,~~OAUJ~~;QACC,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAA8B,CAAC;~~QAEhE~~,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,0BAA0B,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,+CAA+C;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,~~EAAE~~,CAAC;~~QACvC~~,IAAI,SAAS,EAAE,CAAC;YACd,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,iBAAiB;QACjB,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzD,OAAO;QACP,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,gBAAgB,CAAC,MAAM,CAAC,WAAW,CACjC,OAAO,CAAC,UAAU,EAClB,~~OAAO,CAAC,~~aAAa,~~EACrB~~,OAAO,CAAC,UAAU,~~EAClB~~,OAAO,CAAC,UAAU,~~EAClB~~,OAAO,CAAC,aAAa,~~CACtB~~,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAC1B,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,OAAO,CAAC,~~aAAa~~,IAAI,CAAC,~~EAAE~~,~~8BAA8B;YAC1D,~~OAAO,CAAC,aAAa,~~CACtB~~,CAAC;QACJ,CAAC;QAED,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iDAAiD;IACjD,aAAa;~~QACX~~,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,8GAA8G;QAC9G,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEnF,~~sBAAsB~~;~~QACtB~~,~~mEAAmE~~;~~QACnE~~,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU;gBACf,YAAY,CAAC,IAAI,CAAC,MAAM,~~CAAC,MAAM,~~EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;~~QAE7F~~,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACO,4BAA4B;QACpC,0BAA0B;QAC1B,MAAM,MAAM,GAAmB;YAC7B,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,MAAM;YACjD,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SAC3E,CAAC;QAEF,yBAAyB;QACzB,6EAA6E;QAC7E,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACtC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;gBACvD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAC,CAAC,CAAC;QACnF,CAAC;QAED,4BAA4B;QAC5B,MAAM,QAAQ,GAAqB;YACjC,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,MAAM;YACnD,OAAO;SACR,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAC9C,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,MAAM,UAAU,GAAgC;YAC9C,MAAM;YACN,QAAQ;YACR,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;aAC9B;YACD,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,yEAAyE;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAEhG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;YAC5C,UAAU,CAAC,YAAY,GAAG;gBACxB,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC;aAC5C,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,yCAAyC,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE7E,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
1	+ {"version":3,"file":"webgpu-render-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"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"}

package/dist/adapter/resources/webgpu-sampler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAwBlD,OAAO,IAAI,IAAI;~~CAMzB~~"}
1	+ {"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAwBlD,OAAO,IAAI,IAAI;CAWzB"}

package/dist/adapter/resources/webgpu-sampler.js CHANGED Viewed

@@ -27,6 +27,10 @@ export class WebGPUSampler extends Sampler {
         this.handle.label = this.props.id;
     }
     destroy() {
+        if (this.destroyed) {
+            return;
+        }
+        this.destroyResource();
         // GPUSampler does not have a destroy method
         // this.handle.destroy();
         // @ts-expect-error readonly

package/dist/adapter/resources/webgpu-sampler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-sampler.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,oCAAoC;AAEpC,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAOpD;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAO;IAC/B,MAAM,CAAe;IACrB,MAAM,CAAa;IAE5B,YAAY,MAAoB,EAAE,KAAyB;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,0CAA0C;QAC1C,MAAM,iBAAiB,GAAkC;YACvD,GAAG,IAAI,CAAC,KAAK;YACb,YAAY,EAAE,SAAS;SACxB,CAAC;QAEF,mEAAmE;QACnE,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACxC,OAAO,iBAAiB,CAAC,OAAO,CAAC;QACnC,CAAC;QAED,kCAAkC;QAClC,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACxD,iBAAiB,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,4CAA4C;QAC5C,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
1	+ {"version":3,"file":"webgpu-sampler.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,oCAAoC;AAEpC,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAOpD;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAO;IAC/B,MAAM,CAAe;IACrB,MAAM,CAAa;IAE5B,YAAY,MAAoB,EAAE,KAAyB;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,0CAA0C;QAC1C,MAAM,iBAAiB,GAAkC;YACvD,GAAG,IAAI,CAAC,KAAK;YACb,YAAY,EAAE,SAAS;SACxB,CAAC;QAEF,mEAAmE;QACnE,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACxC,OAAO,iBAAiB,CAAC,OAAO,CAAC;QACnC,CAAC;QAED,kCAAkC;QAClC,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACxD,iBAAiB,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,4CAA4C;QAC5C,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}

package/dist/adapter/resources/webgpu-texture-view.d.ts CHANGED Viewed

@@ -15,5 +15,11 @@ export declare class WebGPUTextureView extends TextureView {
         texture: WebGPUTexture;
     });
     destroy(): void;
+    /**
+     * Internal-only hook for the cached CanvasContext/PresentationContext swapchain path.
+     * Rebuilds the default view when the per-frame canvas texture handle changes, without
+     * replacing the long-lived luma.gl wrapper object.
+     */
+    _reinitialize(texture: WebGPUTexture): void;
 }
 //# sourceMappingURL=webgpu-texture-view.d.ts.map

package/dist/adapter/resources/webgpu-texture-view.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webgpu-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,KAAK,EAAC,aAAa,EAAC,4BAAyB;~~AAiBpD~~,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;gBAEpB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG;QAAC,OAAO,EAAE,aAAa,CAAA;KAAC;~~IAyBjF~~,OAAO,IAAI,IAAI;~~CAMzB~~"}
1	+ {"version":3,"file":"webgpu-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,KAAK,EAAC,aAAa,EAAC,4BAAyB;AAkBpD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;gBAEpB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG;QAAC,OAAO,EAAE,aAAa,CAAA;KAAC;IAuBjF,OAAO,IAAI,IAAI;IAYxB;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CA8B5C"}