@luma.gl/webgpu 9.0.0-beta.6 → 9.0.0-beta.7

package/dist/adapter/helpers/get-bind-group.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="dist" />
-import type { ShaderLayout, BindingDeclaration, Binding } from '@luma.gl/core';
+import type { ComputeShaderLayout, BindingDeclaration, Binding } from '@luma.gl/core';
 /**
  * Create a WebGPU "bind group layout" from an array of luma.gl bindings
  * @note bind groups can be automatically generated by WebGPU.
@@ -8,6 +8,6 @@ export declare function makeBindGroupLayout(device: GPUDevice, layout: GPUBindGr
 /**
  * Create a WebGPU "bind group" from an array of luma.gl bindings
  */
-export declare function getBindGroup(device: GPUDevice, bindGroupLayout: GPUBindGroupLayout, shaderLayout: ShaderLayout, bindings: Record<string, Binding>): GPUBindGroup;
-export declare function getShaderLayoutBinding(shaderLayout: ShaderLayout, bindingName: string): BindingDeclaration;
+export declare function getBindGroup(device: GPUDevice, bindGroupLayout: GPUBindGroupLayout, shaderLayout: ComputeShaderLayout, bindings: Record<string, Binding>): GPUBindGroup;
+export declare function getShaderLayoutBinding(shaderLayout: ComputeShaderLayout, bindingName: string): BindingDeclaration;
 //# sourceMappingURL=get-bind-group.d.ts.map

package/dist/adapter/helpers/get-bind-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-bind-group.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-bind-group.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,kBAAkB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAM7E;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,OAAO,EAAE,GAClB,kBAAkB,CAMpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,kBAAkB,EACnC,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,YAAY,CAMd;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,MAAM,GAClB,kBAAkB,CASpB"}
+{"version":3,"file":"get-bind-group.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-bind-group.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAMpF;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,OAAO,EAAE,GAClB,kBAAkB,CAMpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,kBAAkB,EACnC,YAAY,EAAE,mBAAmB,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,YAAY,CAMd;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,mBAAmB,EACjC,WAAW,EAAE,MAAM,GAClB,kBAAkB,CASpB"}

package/dist/adapter/resources/webgpu-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-buffer.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAMnD,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IA8B3C,OAAO,IAAI,IAAI;IAKf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,SAAI;IAUrC,SAAS,CACtB,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAwB,GACnC,OAAO,CAAC,UAAU,CAAC;IAsBtB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAQtD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,cAAc,CAAC,MAAM,GAAE,MAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW;IAI9D,KAAK,IAAI,IAAI;CAGd;AA4CD;;;;;;;;EAQE"}
+{"version":3,"file":"webgpu-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-buffer.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAMnD,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IA8B3C,OAAO,IAAI,IAAI;IAOf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,SAAI;IAUrC,SAAS,CACtB,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAwB,GACnC,OAAO,CAAC,UAAU,CAAC;IAsBtB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAQtD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,cAAc,CAAC,MAAM,GAAE,MAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW;IAI9D,KAAK,IAAI,IAAI;CAGd;AA4CD;;;;;;;;EAQE"}

package/dist/adapter/resources/webgpu-buffer.js

@@ -34,7 +34,9 @@ export class WebGPUBuffer extends Buffer {
         }
     }
     destroy() {
-        this.handle.destroy();
+        this.handle?.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
     // WebGPU provides multiple ways to write a buffer...
     write(data, byteOffset = 0) {

package/dist/adapter/resources/webgpu-compute-pass.d.ts

@@ -1,30 +1,36 @@
 /// <reference types="dist" />
 import { ComputePass, ComputePassProps, ComputePipeline, Buffer, Binding } from '@luma.gl/core';
 import { WebGPUDevice } from "../webgpu-device.js";
+import { WebGPUComputePipeline } from "./webgpu-compute-pipeline.js";
 export declare class WebGPUComputePass extends ComputePass {
     readonly device: WebGPUDevice;
     readonly handle: GPUComputePassEncoder;
-    _bindGroupLayout: GPUBindGroupLayout | null;
+    _webgpuPipeline: WebGPUComputePipeline | null;
     constructor(device: WebGPUDevice, props: ComputePassProps);
     /** @note no WebGPU destroy method, just gc */
     destroy(): void;
     end(): void;
     setPipeline(pipeline: ComputePipeline): void;
-    /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
+    /**
+     * Sets an array of bindings (uniform buffers, samplers, textures, ...)
+     * TODO - still some API confusion - does this method go here or on the pipeline?
+     */
     setBindings(bindings: Binding[]): void;
     /**
      * Dispatch work to be performed with the current ComputePipeline.
-     * @param x X dimension of the grid of workgroups to dispatch.
-     * @param y Y dimension of the grid of workgroups to dispatch.
-     * @param z Z dimension of the grid of workgroups to dispatch.
+     * @param x X dimension of the grid of work groups to dispatch.
+     * @param y Y dimension of the grid of work groups to dispatch.
+     * @param z Z dimension of the grid of work groups to dispatch.
      */
     dispatch(x: number, y?: number, z?: number): void;
     /**
      * Dispatch work to be performed with the current ComputePipeline.
-     * @param indirectBuffer buffer must be a tightly packed block of three 32-bit unsigned integer values (12 bytes total), given in the same order as the arguments for dispatch()
-     * @param indirectOffset
+     *
+     * Buffer must be a tightly packed block of three 32-bit unsigned integer values (12 bytes total), given in the same order as the arguments for dispatch()
+     * @param indirectBuffer
+     * @param indirectOffset offset in buffer to the beginning of the dispatch data.
      */
-    dispatchIndirect(indirectBuffer: Buffer, indirectOffset?: number): void;
+    dispatchIndirect(indirectBuffer: Buffer, indirectByteOffset?: number): void;
     pushDebugGroup(groupLabel: string): void;
     popDebugGroup(): void;
     insertDebugMarker(markerLabel: string): void;

package/dist/adapter/resources/webgpu-compute-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-compute-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pass.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAM9C,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,gBAAgB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAEvC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB;IAyBzD,8CAA8C;IACrC,OAAO,IAAI,IAAI;IAExB,GAAG,IAAI,IAAI;IAIX,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAM5C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI;IAMtC;;;;;OAKG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIjD;;;;OAIG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,GAAE,MAAU,GAAG,IAAI;IAK1E,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC,aAAa,IAAI,IAAI;IAIrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CAG7C"}
+{"version":3,"file":"webgpu-compute-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pass.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAGhE,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAEvC,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAQ;gBAEzC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB;IAyBzD,8CAA8C;IACrC,OAAO,IAAI,IAAI;IAExB,GAAG,IAAI,IAAI;IAIX,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAO5C;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI;IAKtC;;;;;OAKG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIjD;;;;;;OAMG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,kBAAkB,GAAE,MAAU,GAAG,IAAI;IAK9E,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC,aAAa,IAAI,IAAI;IAIrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CAG7C"}

package/dist/adapter/resources/webgpu-compute-pass.js

@@ -5,7 +5,7 @@ import { ComputePass } from '@luma.gl/core';
 export class WebGPUComputePass extends ComputePass {
     device;
     handle;
-    _bindGroupLayout = null;
+    _webgpuPipeline = null;
     constructor(device, props) {
         super(device, props);
         this.device = device;
@@ -36,31 +36,36 @@ export class WebGPUComputePass extends ComputePass {
     setPipeline(pipeline) {
         const wgpuPipeline = pipeline;
         this.handle.setPipeline(wgpuPipeline.handle);
-        this._bindGroupLayout = wgpuPipeline._getBindGroupLayout();
+        this._webgpuPipeline = wgpuPipeline;
+        this.setBindings([]);
     }
-    /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
+    /**
+     * Sets an array of bindings (uniform buffers, samplers, textures, ...)
+     * TODO - still some API confusion - does this method go here or on the pipeline?
+     */
     setBindings(bindings) {
-        throw new Error('fix me');
-        // const bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.bindings);
-        // this.handle.setBindGroup(0, bindGroup);
+        const bindGroup = this._webgpuPipeline._getBindGroup();
+        this.handle.setBindGroup(0, bindGroup);
     }
     /**
      * Dispatch work to be performed with the current ComputePipeline.
-     * @param x X dimension of the grid of workgroups to dispatch.
-     * @param y Y dimension of the grid of workgroups to dispatch.
-     * @param z Z dimension of the grid of workgroups to dispatch.
+     * @param x X dimension of the grid of work groups to dispatch.
+     * @param y Y dimension of the grid of work groups to dispatch.
+     * @param z Z dimension of the grid of work groups to dispatch.
      */
     dispatch(x, y, z) {
         this.handle.dispatchWorkgroups(x, y, z);
     }
     /**
      * Dispatch work to be performed with the current ComputePipeline.
-     * @param indirectBuffer buffer must be a tightly packed block of three 32-bit unsigned integer values (12 bytes total), given in the same order as the arguments for dispatch()
-     * @param indirectOffset
+     *
+     * Buffer must be a tightly packed block of three 32-bit unsigned integer values (12 bytes total), given in the same order as the arguments for dispatch()
+     * @param indirectBuffer
+     * @param indirectOffset offset in buffer to the beginning of the dispatch data.
      */
-    dispatchIndirect(indirectBuffer, indirectOffset = 0) {
+    dispatchIndirect(indirectBuffer, indirectByteOffset = 0) {
         const webgpuBuffer = indirectBuffer;
-        this.handle.dispatchWorkgroupsIndirect(webgpuBuffer.handle, indirectOffset);
+        this.handle.dispatchWorkgroupsIndirect(webgpuBuffer.handle, indirectByteOffset);
     }
     pushDebugGroup(groupLabel) {
         this.handle.pushDebugGroup(groupLabel);

package/dist/adapter/resources/webgpu-compute-pipeline.d.ts

@@ -1,12 +1,22 @@
 /// <reference types="dist" />
-import { ComputePipeline, ComputePipelineProps } from '@luma.gl/core';
+import { ComputePipeline, ComputePipelineProps, Binding } from '@luma.gl/core';
 import { WebGPUDevice } from "../webgpu-device.js";
 /** Creates a new compute pipeline when parameters change */
 export declare class WebGPUComputePipeline extends ComputePipeline {
     device: WebGPUDevice;
     handle: GPUComputePipeline;
+    /** For internal use to create BindGroups */
+    private _bindGroupLayout;
+    private _bindGroup;
+    /** For internal use to create BindGroups */
+    private _bindings;
     constructor(device: WebGPUDevice, props: ComputePipelineProps);
-    /** For internal use in render passes */
-    _getBindGroupLayout(): GPUBindGroupLayout;
+    /**
+     * @todo Use renderpass.setBindings() ?
+     * @todo Do we want to expose BindGroups in the API and remove this?
+     */
+    setBindings(bindings: Record<string, Binding>): void;
+    /** Return a bind group created by setBindings */
+    _getBindGroup(): GPUBindGroup;
 }
 //# sourceMappingURL=webgpu-compute-pipeline.d.ts.map

package/dist/adapter/resources/webgpu-compute-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-compute-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAEpE,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAK9C,4DAA4D;AAC5D,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,kBAAkB,CAAC;gBAEf,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAkB7D,wCAAwC;IACxC,mBAAmB;CAIpB"}
+{"version":3,"file":"webgpu-compute-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAK9C,4DAA4D;AAC5D,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,kBAAkB,CAAC;IAE3B,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAC/C,4CAA4C;IAC5C,OAAO,CAAC,SAAS,CAA+B;gBAEpC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAmB7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIpD,iDAAiD;IACjD,aAAa;CAgBd"}

package/dist/adapter/resources/webgpu-compute-pipeline.js

@@ -2,30 +2,48 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { ComputePipeline } from '@luma.gl/core';
+import { getBindGroup } from "../helpers/get-bind-group.js";
 // COMPUTE PIPELINE
 /** Creates a new compute pipeline when parameters change */
 export class WebGPUComputePipeline extends ComputePipeline {
     device;
     handle;
+    /** For internal use to create BindGroups */
+    _bindGroupLayout = null;
+    _bindGroup = null;
+    /** For internal use to create BindGroups */
+    _bindings = {};
     constructor(device, props) {
         super(device, props);
         this.device = device;
-        const webgpuShader = this.props.cs;
+        const webgpuShader = this.props.shader;
         this.handle =
             this.props.handle ||
                 this.device.handle.createComputePipeline({
                     label: this.props.id,
                     compute: {
                         module: webgpuShader.handle,
-                        entryPoint: this.props.csEntryPoint
-                        // constants: this.props.csConstants
+                        entryPoint: this.props.entryPoint,
+                        constants: this.props.constants
                     },
                     layout: 'auto'
                 });
     }
-    /** For internal use in render passes */
-    _getBindGroupLayout() {
-        // TODO: Cache?
-        return this.handle.getBindGroupLayout(0);
+    /**
+     * @todo Use renderpass.setBindings() ?
+     * @todo Do we want to expose BindGroups in the API and remove this?
+     */
+    setBindings(bindings) {
+        Object.assign(this._bindings, bindings);
+    }
+    /** Return a bind group created by setBindings */
+    _getBindGroup() {
+        // 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
+        this._bindGroup =
+            this._bindGroup ||
+                getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this._bindings);
+        return this._bindGroup;
     }
 }

package/dist/adapter/resources/webgpu-external-texture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-external-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-external-texture.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3F,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAE/C;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,aAAa,CAAC;gBAEX,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAYpD,OAAO,IAAI,IAAI;IAMxB,0BAA0B;IAC1B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;CAMlD"}
+{"version":3,"file":"webgpu-external-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-external-texture.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3F,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAE/C;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,aAAa,CAAC;gBAEX,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAYpD,OAAO,IAAI,IAAI;IAQxB,0BAA0B;IAC1B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;CAMlD"}

package/dist/adapter/resources/webgpu-external-texture.js

@@ -26,6 +26,8 @@ export class WebGPUExternalTexture extends ExternalTexture {
         // External textures are destroyed automatically,
         // as a microtask, instead of manually or upon garbage collection like other resources.
         // this.handle.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
     /** Set default sampler */
     setSampler(sampler) {

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

@@ -1 +1 @@
-{"version":3,"file":"webgpu-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa;IAY7C,OAAO,IAAI,IAAI;CAGzB"}
+{"version":3,"file":"webgpu-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa;IAY7C,OAAO,IAAI,IAAI;CAKzB"}

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

@@ -20,6 +20,8 @@ export class WebGPUQuerySet extends QuerySet {
         this.handle.label = this.props.id;
     }
     destroy() {
-        this.handle.destroy();
+        this.handle?.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
 }

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

@@ -10,11 +10,17 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
     vs: WebGPUShader;
     fs: WebGPUShader | null;
     /** For internal use to create BindGroups */
+    private _bindings;
     private _bindGroupLayout;
     private _bindGroup;
     constructor(device: WebGPUDevice, props: RenderPipelineProps);
     destroy(): void;
+    /**
+     * @todo Use renderpass.setBindings() ?
+     * @todo Do we want to expose BindGroups in the API and remove this?
+     */
     setBindings(bindings: Record<string, Binding>): void;
+    /** @todo - should this be moved to renderpass? */
     draw(options: {
         renderPass: RenderPass;
         vertexArray: VertexArray;
@@ -25,7 +31,7 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
         firstIndex?: number;
         firstInstance?: number;
         baseVertex?: number;
-    }): void;
+    }): boolean;
     /** Return a bind group created by setBindings */
     _getBindGroup(): GPUBindGroup;
     /**
@@ -33,4 +39,46 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
      */
     protected _getRenderPipelineDescriptor(): GPURenderPipelineDescriptor;
 }
+/**
+_setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {
+  if (this._indexBuffer) {
+    webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);
+  }
+
+  const buffers = this._getBuffers();
+  for (let i = 0; i < buffers.length; ++i) {
+    const buffer = cast<WebGPUBuffer>(buffers[i]);
+    if (!buffer) {
+      const attribute = this.props.shaderLayout.attributes.find(
+        (attribute) => attribute.location === i
+      );
+      throw new Error(
+        `No buffer provided for attribute '${attribute?.name || ''}' in Model '${this.props.id}'`
+      );
+    }
+    webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);
+  }
+
+  // TODO - HANDLE buffer maps
+  /*
+  for (const [bufferName, attributeMapping] of Object.entries(this.props.bufferLayout)) {
+    const buffer = cast<WebGPUBuffer>(this.props.attributes[bufferName]);
+    if (!buffer) {
+      log.warn(`Missing buffer for buffer map ${bufferName}`)();
+      continue;
+    }
+
+    if ('location' in attributeMapping) {
+      // @ts-expect-error TODO model must not depend on webgpu
+      renderPass.handle.setVertexBuffer(layout.location, buffer.handle);
+    } else {
+      for (const [bufferName, mapping] of Object.entries(attributeMapping)) {
+        // @ts-expect-error TODO model must not depend on webgpu
+        renderPass.handle.setVertexBuffer(field.location, buffer.handle);
+      }
+    }
+  }
+  *
+}
+*/
 //# sourceMappingURL=webgpu-render-pipeline.d.ts.map

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

@@ -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,EAAY,MAAM,eAAe,CAAC;AAS7E,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAKlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAO/B,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAoBnD,OAAO,IAAI,IAAI;IA2BxB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IASpD,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,IAAI;IA0CR,iDAAiD;IACjD,aAAa;IAiBb;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAyFvC"}
+{"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,EAAY,MAAM,eAAe,CAAC;AAS7E,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAKlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAE/B,4CAA4C;IAC5C,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAmBnD,OAAO,IAAI,IAAI;IAKxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIpD,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;IAuCX,iDAAiD;IACjD,aAAa;IAsBb;;OAEG;IACH,SAAS,CAAC,4BAA4B;CA2CvC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}

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

@@ -11,11 +11,8 @@ export class WebGPURenderPipeline extends RenderPipeline {
     handle;
     vs;
     fs = null;
-    // private _bufferSlots: Record<string, number>;
-    // private _buffers: Buffer[];
-    // private _firstIndex: number;
-    // private _lastIndex: number;
     /** For internal use to create BindGroups */
+    _bindings;
     _bindGroupLayout = null;
     _bindGroup = null;
     constructor(device, props) {
@@ -32,42 +29,22 @@ export class WebGPURenderPipeline extends RenderPipeline {
         this.handle.label = this.props.id;
         this.vs = cast(props.vs);
         this.fs = cast(props.fs);
-        // this._bufferSlots = getBufferSlots(this.props.shaderLayout, this.props.bufferLayout);
-        // this._buffers = new Array<Buffer>(Object.keys(this._bufferSlots).length).fill(null);
+        this._bindings = { ...this.props.bindings };
     }
     destroy() {
         // WebGPURenderPipeline has no destroy method.
+        this.handle = null;
     }
-    // setIndexBuffer(indexBuffer: Buffer): void {
-    //   this._indexBuffer = cast<WebGPUBuffer>(indexBuffer);
-    // }
-    // setAttributes(attributes: Record<string, Buffer>): void {
-    //   for (const [name, buffer] of Object.entries(attributes)) {
-    //     const bufferIndex = this._bufferSlots[name];
-    //     if (bufferIndex >= 0) {
-    //       this._buffers[bufferIndex] = buffer;
-    //     } else {
-    //       throw new Error(
-    //         `Setting attribute '${name}' not listed in shader layout for program ${this.id}`
-    //       );
-    //     }
-    //   }
-    //   // for (let i = 0; i < this._bufferSlots.length; ++i) {
-    //   //   const bufferName = this._bufferSlots[i];
-    //   //   if (attributes[bufferName]) {
-    //   //     this.handle
-    //   //   }
-    //   // }
-    // }
+    /**
+     * @todo Use renderpass.setBindings() ?
+     * @todo Do we want to expose BindGroups in the API and remove this?
+     */
     setBindings(bindings) {
-        // if (isObjectEmpty(bindings)) {
-        //   return;
-        // }
-        // Do we want to save things on CPU side?
-        Object.assign(this.props.bindings, bindings);
+        Object.assign(this._bindings, bindings);
     }
+    /** @todo - should this be moved to renderpass? */
     draw(options) {
-        const webgpuRenderPass = cast(options.renderPass) || this.device.getDefaultRenderPass();
+        const webgpuRenderPass = options.renderPass;
         // Set pipeline
         webgpuRenderPass.handle.setPipeline(this.handle);
         // Set bindings (uniform buffers, textures etc)
@@ -88,18 +65,20 @@ export class WebGPURenderPipeline extends RenderPipeline {
         }
         // Note: Rebinds constant attributes before each draw call
         options.vertexArray.unbindAfterRender(options.renderPass);
+        return true;
     }
-    // _getBuffers() {
-    //   return this._buffers;
-    // }
     /** Return a bind group created by setBindings */
     _getBindGroup() {
+        if (this.props.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!
         this._bindGroup =
             this._bindGroup ||
-                getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this.props.bindings);
+                getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this._bindings);
         return this._bindGroup;
     }
     /**
@@ -109,23 +88,20 @@ export class WebGPURenderPipeline extends RenderPipeline {
         // Set up the vertex stage
         const vertex = {
             module: cast(this.props.vs).handle,
-            entryPoint: this.props.vsEntryPoint || 'main',
+            entryPoint: this.props.vertexEntryPoint || 'main',
             buffers: getVertexBufferLayout(this.props.shaderLayout, this.props.bufferLayout)
         };
         // Set up the fragment stage
-        let fragment;
-        if (this.props.fs) {
-            fragment = {
-                module: cast(this.props.fs).handle,
-                entryPoint: this.props.fsEntryPoint || 'main',
-                targets: [
-                    {
-                        // TODO exclamation mark hack!
-                        format: getWebGPUTextureFormat(this.device?.canvasContext?.format)
-                    }
-                ]
-            };
-        }
+        const fragment = {
+            module: cast(this.props.fs).handle,
+            entryPoint: this.props.fragmentEntryPoint || 'main',
+            targets: [
+                {
+                    // TODO exclamation mark hack!
+                    format: getWebGPUTextureFormat(this.device?.canvasContext?.format)
+                }
+            ]
+        };
         // WebGPU has more restrictive topology support than WebGL
         switch (this.props.topology) {
             case 'triangle-fan-webgl':
@@ -147,3 +123,45 @@ export class WebGPURenderPipeline extends RenderPipeline {
         return descriptor;
     }
 }
+/**
+_setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {
+  if (this._indexBuffer) {
+    webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);
+  }
+
+  const buffers = this._getBuffers();
+  for (let i = 0; i < buffers.length; ++i) {
+    const buffer = cast<WebGPUBuffer>(buffers[i]);
+    if (!buffer) {
+      const attribute = this.props.shaderLayout.attributes.find(
+        (attribute) => attribute.location === i
+      );
+      throw new Error(
+        `No buffer provided for attribute '${attribute?.name || ''}' in Model '${this.props.id}'`
+      );
+    }
+    webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);
+  }
+
+  // TODO - HANDLE buffer maps
+  /*
+  for (const [bufferName, attributeMapping] of Object.entries(this.props.bufferLayout)) {
+    const buffer = cast<WebGPUBuffer>(this.props.attributes[bufferName]);
+    if (!buffer) {
+      log.warn(`Missing buffer for buffer map ${bufferName}`)();
+      continue;
+    }
+
+    if ('location' in attributeMapping) {
+      // @ts-expect-error TODO model must not depend on webgpu
+      renderPass.handle.setVertexBuffer(layout.location, buffer.handle);
+    } else {
+      for (const [bufferName, mapping] of Object.entries(attributeMapping)) {
+        // @ts-expect-error TODO model must not depend on webgpu
+        renderPass.handle.setVertexBuffer(field.location, buffer.handle);
+      }
+    }
+  }
+  *
+}
+*/

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

@@ -1 +1 @@
-{"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":";AAAA,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;IAclD,OAAO,IAAI,IAAI;CAGzB"}
+{"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":";AAAA,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;IAclD,OAAO,IAAI,IAAI;CAMzB"}

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

@@ -17,6 +17,9 @@ export class WebGPUSampler extends Sampler {
         this.handle.label = this.props.id;
     }
     destroy() {
+        // GPUSampler does not have a destroy method
         // this.handle.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
 }

package/dist/adapter/resources/webgpu-shader.d.ts

@@ -2,16 +2,13 @@
 import type { ShaderProps, CompilerMessage } from '@luma.gl/core';
 import { Shader } from '@luma.gl/core';
 import type { WebGPUDevice } from "../webgpu-device.js";
-export type WebGPUShaderProps = ShaderProps & {
-    handle?: GPUShaderModule;
-};
 /**
  * Immutable shader
  */
 export declare class WebGPUShader extends Shader {
     readonly device: WebGPUDevice;
     readonly handle: GPUShaderModule;
-    constructor(device: WebGPUDevice, props: WebGPUShaderProps);
+    constructor(device: WebGPUDevice, props: ShaderProps);
     _checkCompilationError(errorScope: Promise<GPUError | null>): Promise<void>;
     destroy(): void;
     /** Returns compilation info for this shader */

package/dist/adapter/resources/webgpu-shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,MAAM,EAAM,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,iBAAiB;IAYpD,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxE,OAAO,IAAI,IAAI;IAKxB,+CAA+C;IACzC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAO/D,SAAS,CAAC,YAAY,IAAI,eAAe;CAuB1C"}
+{"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,MAAM,EAAM,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD;;GAEG;AACH,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IAY9C,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxE,OAAO,IAAI,IAAI;IAOxB,+CAA+C;IACzC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAO/D,SAAS,CAAC,YAAY,IAAI,eAAe;CAU1C"}

package/dist/adapter/resources/webgpu-shader.js

@@ -31,6 +31,8 @@ export class WebGPUShader extends Shader {
     destroy() {
         // Note: WebGPU does not offer a method to destroy shaders
         // this.handle.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
     /** Returns compilation info for this shader */
     async getCompilationInfo() {
@@ -39,24 +41,11 @@ export class WebGPUShader extends Shader {
     }
     // PRIVATE METHODS
     createHandle() {
-        const { source, stage } = this.props;
-        let language = this.props.language;
-        // Compile from src
-        if (language === 'auto') {
-            // wgsl uses C++ "auto" style arrow notation
-            language = source.includes('->') ? 'wgsl' : 'glsl';
-        }
-        switch (language) {
-            case 'wgsl':
-                return this.device.handle.createShaderModule({ code: source });
-            case 'glsl':
-                return this.device.handle.createShaderModule({
-                    code: source,
-                    // @ts-expect-error
-                    transform: glsl => this.device.glslang.compileGLSL(glsl, stage)
-                });
-            default:
-                throw new Error(language);
+        const { source } = this.props;
+        const isGLSL = source.includes('#version');
+        if (this.props.language === 'glsl' || isGLSL) {
+            throw new Error('GLSL shaders are not supported in WebGPU');
         }
+        return this.device.handle.createShaderModule({ code: source });
     }
 }

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

@@ -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;AAEpD,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;IAmBjF,OAAO,IAAI,IAAI;CAGzB"}
+{"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;AAEpD,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;IAmBjF,OAAO,IAAI,IAAI;CAMzB"}

package/dist/adapter/resources/webgpu-texture-view.js

@@ -27,6 +27,9 @@ export class WebGPUTextureView extends TextureView {
         this.handle.label = this.props.id;
     }
     destroy() {
+        // GPUTextureView does not have a destroy method
         // this.handle.destroy();
+        // @ts-expect-error readonly
+        this.handle = null;
     }
 }