@luma.gl/webgpu 9.0.0-alpha.14 → 9.0.0-alpha.16

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":";AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACtD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAA2B,MAAM,cAAc,CAAC;AASnG,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAC;AAIzD,2DAA2D;AAC3D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,cAAc;IAC9D,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAE/B,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,YAAY,CAA6B;IAIjD,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAc5D,SAAS,CAAC,YAAY,IAAI,iBAAiB;IASlC,OAAO,IAAI,IAAI;IAIxB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAmBvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAapD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,WAAW;IAIX,iDAAiD;IACjD,aAAa;IAKb,8DAA8D;IAC9D,SAAS,CAAC,4BAA4B;IA8CtC,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,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;IAmCR,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;CAwCxD"}
+{"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACtD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAA2B,MAAM,cAAc,CAAC;AASnG,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAC;AAIzD,2DAA2D;AAC3D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,cAAc;IAC9D,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAE/B,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,YAAY,CAA6B;IAIjD,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAc5D,SAAS,CAAC,YAAY,IAAI,iBAAiB;IASlC,OAAO,IAAI,IAAI;IAIxB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAmBvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAapD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,WAAW;IAIX,iDAAiD;IACjD,aAAa;IAKb,8DAA8D;IAC9D,SAAS,CAAC,4BAA4B;IA+CtC,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,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;IAmCR,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;CAwCxD"}

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

@@ -1,166 +1,170 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { RenderPipeline, cast, log, isObjectEmpty } from '@luma.gl/api';
-import { applyParametersToRenderPipelineDescriptor } from '../helpers/webgpu-parameters';
-import { getWebGPUTextureFormat } from '../helpers/convert-texture-format';
-import { getBindGroup } from '../helpers/get-bind-group';
-import { getVertexBufferLayout, getBufferSlots } from '../helpers/get-vertex-buffer-layout';
+import { applyParametersToRenderPipelineDescriptor } from '../helpers/webgpu-parameters.js';
+import { getWebGPUTextureFormat } from '../helpers/convert-texture-format.js';
+import { getBindGroup } from '../helpers/get-bind-group.js';
+import { getVertexBufferLayout, getBufferSlots } from '../helpers/get-vertex-buffer-layout.js';
+// RENDER PIPELINE
+/** Creates a new render pipeline when parameters change */
 export default class WebGPURenderPipeline extends RenderPipeline {
-  constructor(device, props) {
-    super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    _defineProperty(this, "vs", void 0);
-
-    _defineProperty(this, "fs", null);
-
-    _defineProperty(this, "_bufferSlots", void 0);
-
-    _defineProperty(this, "_buffers", void 0);
-
-    _defineProperty(this, "_indexBuffer", null);
-
-    _defineProperty(this, "_bindGroupLayout", void 0);
-
-    _defineProperty(this, "_bindGroup", null);
-
-    this.device = device;
-    this.handle = this.props.handle || this.createHandle();
-    this.handle.label = this.props.id;
-    this.vs = cast(props.vs);
-    this.fs = cast(props.fs);
-    this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);
-    this._buffers = new Array(Object.keys(this._bufferSlots).length).fill(null);
-    this._bindGroupLayout = this.handle.getBindGroupLayout(0);
-  }
-
-  createHandle() {
-    const descriptor = this._getRenderPipelineDescriptor();
-
-    const renderPipeline = this.device.handle.createRenderPipeline(descriptor);
-    log.groupCollapsed(1, "new WebGPRenderPipeline(".concat(this.id, ")"))();
-    log.log(1, JSON.stringify(descriptor, null, 2))();
-    log.groupEnd(1)();
-    return renderPipeline;
-  }
-
-  destroy() {}
-
-  setIndexBuffer(indexBuffer) {
-    this._indexBuffer = cast(indexBuffer);
-  }
-
-  setAttributes(attributes) {
-    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 '".concat(name, "' not listed in shader layout for program ").concat(this.id));
-      }
+    constructor(device, props) {
+        super(device, props);
+        this.fs = null;
+        this._indexBuffer = null;
+        this._bindGroup = null;
+        this.device = device;
+        this.handle = this.props.handle || this.createHandle();
+        this.handle.label = this.props.id;
+        this.vs = cast(props.vs);
+        this.fs = cast(props.fs);
+        this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);
+        this._buffers = new Array(Object.keys(this._bufferSlots).length).fill(null);
+        this._bindGroupLayout = this.handle.getBindGroupLayout(0);
     }
-  }
-
-  setBindings(bindings) {
-    if (!isObjectEmpty(this.props.bindings)) {
-      Object.assign(this.props.bindings, bindings);
-      this._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.layout, this.props.bindings);
+    createHandle() {
+        const descriptor = this._getRenderPipelineDescriptor();
+        const renderPipeline = this.device.handle.createRenderPipeline(descriptor);
+        log.groupCollapsed(1, `new WebGPRenderPipeline(${this.id})`)();
+        log.log(1, JSON.stringify(descriptor, null, 2))();
+        log.groupEnd(1)();
+        return renderPipeline;
     }
-  }
-
-  setUniforms(uniforms) {
-    if (!isObjectEmpty(uniforms)) {
-      throw new Error('WebGPU does not support uniforms');
+    destroy() {
+        // WebGPURenderPipeline has no destroy method.
     }
-  }
-
-  _getBuffers() {
-    return this._buffers;
-  }
-
-  _getBindGroup() {
-    return this._bindGroup;
-  }
-
-  _getRenderPipelineDescriptor() {
-    const vertex = {
-      module: cast(this.props.vs).handle,
-      entryPoint: this.props.vsEntryPoint || 'main',
-      buffers: getVertexBufferLayout(this.props.layout, this.props.bufferMap)
-    };
-    let fragment;
-
-    if (this.props.fs) {
-      var _this$device, _this$device$canvasCo;
-
-      fragment = {
-        module: cast(this.props.fs).handle,
-        entryPoint: this.props.fsEntryPoint || 'main',
-        targets: [{
-          format: getWebGPUTextureFormat((_this$device = this.device) === null || _this$device === void 0 ? void 0 : (_this$device$canvasCo = _this$device.canvasContext) === null || _this$device$canvasCo === void 0 ? void 0 : _this$device$canvasCo.format)
-        }]
-      };
+    setIndexBuffer(indexBuffer) {
+        this._indexBuffer = cast(indexBuffer);
     }
-
-    switch (this.props.topology) {
-      case 'triangle-fan':
-      case 'line-loop':
-        throw new Error("WebGPU does not support primitive topology ".concat(this.props.topology));
-
-      default:
+    setAttributes(attributes) {
+        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
+        //   }
+        // }
     }
-
-    let descriptor = {
-      vertex,
-      fragment,
-      primitive: {
-        topology: this.props.topology
-      }
-    };
-    applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);
-    return descriptor;
-  }
-
-  draw(options) {
-    const webgpuRenderPass = cast(options.renderPass) || this.device.getDefaultRenderPass();
-    webgpuRenderPass.handle.setPipeline(this.handle);
-
-    const bindGroup = this._getBindGroup();
-
-    if (bindGroup) {
-      webgpuRenderPass.handle.setBindGroup(0, bindGroup);
+    /** Set the bindings */
+    setBindings(bindings) {
+        if (!isObjectEmpty(this.props.bindings)) {
+            Object.assign(this.props.bindings, bindings);
+            // Set up the bindings
+            this._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.layout, this.props.bindings);
+        }
     }
-
-    this._setAttributeBuffers(webgpuRenderPass);
-
-    if (options.indexCount) {
-      webgpuRenderPass.handle.drawIndexed(options.indexCount, options.instanceCount, options.firstIndex, options.baseVertex, options.firstInstance);
-    } else {
-      webgpuRenderPass.handle.draw(options.vertexCount || 0, options.instanceCount, options.firstIndex, options.firstInstance);
+    setUniforms(uniforms) {
+        if (!isObjectEmpty(uniforms)) {
+            throw new Error('WebGPU does not support uniforms');
+        }
     }
-  }
-
-  _setAttributeBuffers(webgpuRenderPass) {
-    if (this._indexBuffer) {
-      webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);
+    _getBuffers() {
+        return this._buffers;
     }
-
-    const buffers = this._getBuffers();
-
-    for (let i = 0; i < buffers.length; ++i) {
-      const buffer = cast(buffers[i]);
-
-      if (!buffer) {
-        const attribute = this.props.layout.attributes.find(attribute => attribute.location === i);
-        throw new Error("No buffer provided for attribute '".concat((attribute === null || attribute === void 0 ? void 0 : attribute.name) || '', "' in Model '").concat(this.props.id, "'"));
-      }
-
-      webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);
+    /** Return a bind group created by setBindings */
+    _getBindGroup() {
+        // assert(this._bindGroup);
+        return this._bindGroup;
+    }
+    /** Populate the complex WebGPU GPURenderPipelineDescriptor */
+    _getRenderPipelineDescriptor() {
+        // Set up the vertex stage
+        const vertex = {
+            module: cast(this.props.vs).handle,
+            entryPoint: this.props.vsEntryPoint || 'main',
+            buffers: getVertexBufferLayout(this.props.layout, this.props.bufferMap)
+        };
+        // 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)
+                    }
+                ]
+            };
+        }
+        // WebGPU has more restrictive topology support than WebGL
+        switch (this.props.topology) {
+            case 'triangle-fan':
+            case 'line-loop':
+                throw new Error(`WebGPU does not support primitive topology ${this.props.topology}`);
+            default:
+        }
+        // Create a partially populated descriptor
+        let descriptor = {
+            vertex,
+            fragment,
+            primitive: {
+                topology: this.props.topology
+            },
+            layout: 'auto'
+        };
+        // Set parameters on the descriptor
+        applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);
+        return descriptor;
+    }
+    draw(options) {
+        const webgpuRenderPass = cast(options.renderPass) || this.device.getDefaultRenderPass();
+        // Set pipeline
+        webgpuRenderPass.handle.setPipeline(this.handle);
+        // Set bindings (uniform buffers, textures etc)
+        const bindGroup = this._getBindGroup();
+        if (bindGroup) {
+            webgpuRenderPass.handle.setBindGroup(0, bindGroup);
+        }
+        // Set attributes
+        this._setAttributeBuffers(webgpuRenderPass);
+        // Draw
+        if (options.indexCount) {
+            webgpuRenderPass.handle.drawIndexed(options.indexCount, options.instanceCount, options.firstIndex, options.baseVertex, options.firstInstance);
+        }
+        else {
+            webgpuRenderPass.handle.draw(options.vertexCount || 0, options.instanceCount, options.firstIndex, options.firstInstance);
+        }
+    }
+    _setAttributeBuffers(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(buffers[i]);
+            if (!buffer) {
+                const attribute = this.props.layout.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.bufferMap)) {
+          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.js.map

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

@@ -1,7 +1,7 @@
 /// <reference types="@webgpu/types" />
 import { Sampler, SamplerProps } from '@luma.gl/api';
 import type WebGPUDevice from '../webgpu-device';
-export declare type WebGPUSamplerProps = SamplerProps & {
+export type WebGPUSamplerProps = SamplerProps & {
     handle?: GPUSampler;
 };
 /**

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,cAAc,CAAC;AACnD,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,oBAAY,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IAChD,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,cAAc,CAAC;AACnD,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IAChD,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"}

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

@@ -1,26 +1,20 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Sampler } from '@luma.gl/api';
+/**
+ *
+ */
 export default class WebGPUSampler extends Sampler {
-  constructor(device, props) {
-    super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    this.device = device;
-    const samplerProps = { ...this.props
-    };
-
-    if (samplerProps.type !== 'comparison-sampler') {
-      delete samplerProps.compare;
+    constructor(device, props) {
+        super(device, props);
+        this.device = device;
+        // Prepare sampler props
+        const samplerProps = { ...this.props };
+        if (samplerProps.type !== 'comparison-sampler') {
+            delete samplerProps.compare;
+        }
+        this.handle = this.handle || this.device.handle.createSampler(samplerProps);
+        this.handle.label = this.props.id;
+    }
+    destroy() {
+        // this.handle.destroy();
     }
-
-    this.handle = this.handle || this.device.handle.createSampler(samplerProps);
-    this.handle.label = this.props.id;
-  }
-
-  destroy() {}
-
 }
-//# sourceMappingURL=webgpu-sampler.js.map

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

@@ -2,7 +2,7 @@
 import type { ShaderProps, CompilerMessage } from '@luma.gl/api';
 import { Shader } from '@luma.gl/api';
 import type WebGPUDevice from '../webgpu-device';
-export declare type WebGPUShaderProps = ShaderProps & {
+export type WebGPUShaderProps = ShaderProps & {
     handle?: GPUShaderModule;
 };
 /**

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":";AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAM,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,oBAAY,iBAAiB,GAAG,WAAW,GAAG;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,MAAM;IAC9C,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;IAWxE,OAAO,IAAI,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,eAAe;IAwBzC,+CAA+C;IACzC,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAI7D"}
+{"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAM,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,MAAM;IAC9C,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;IAWxE,OAAO,IAAI,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,eAAe;IAwBzC,+CAA+C;IACzC,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAI7D"}

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

@@ -1,64 +1,53 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Shader, log } from '@luma.gl/api';
+/**
+ * Immutable shader
+ */
 export default class WebGPUShader extends Shader {
-  constructor(device, props) {
-    super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    this.device = device;
-    this.device.handle.pushErrorScope('validation');
-    this.handle = this.props.handle || this.createHandle();
-    this.handle.label = this.props.id;
-
-    this._checkCompilationError(this.device.handle.popErrorScope());
-  }
-
-  async _checkCompilationError(errorScope) {
-    const error = await errorScope;
-
-    if (error) {
-      const shaderLog = await this.compilationInfo();
-      log.error("Shader compilation error: ".concat(error.message), shaderLog)();
-      throw new Error("Shader compilation error: ".concat(error.message));
+    constructor(device, props) {
+        super(device, props);
+        this.device = device;
+        this.device.handle.pushErrorScope('validation');
+        this.handle = this.props.handle || this.createHandle();
+        this.handle.label = this.props.id;
+        this._checkCompilationError(this.device.handle.popErrorScope());
     }
-  }
-
-  destroy() {}
-
-  createHandle() {
-    const {
-      source
-    } = this.props;
-    let language = this.props.language;
-
-    if (!language) {
-      language = source.includes('->') ? 'wgsl' : 'glsl';
+    async _checkCompilationError(errorScope) {
+        const error = await errorScope;
+        if (error) {
+            const shaderLog = await this.compilationInfo();
+            log.error(`Shader compilation error: ${error.message}`, shaderLog)();
+            // Note: Even though this error is asynchronous and thrown after the constructor completes,
+            // it will result in a useful stack trace leading back to the constructor
+            throw new Error(`Shader compilation error: ${error.message}`);
+        }
     }
-
-    switch (language) {
-      case 'wgsl':
-        return this.device.handle.createShaderModule({
-          code: source
-        });
-
-      case 'glsl':
-        return this.device.handle.createShaderModule({
-          code: source,
-          transform: glsl => this.device.glslang.compileGLSL(glsl, type)
-        });
-
-      default:
-        throw new Error(language);
+    destroy() {
+        // this.handle.destroy();
+    }
+    createHandle() {
+        const { source } = this.props;
+        let language = this.props.language;
+        // Compile from src
+        if (!language) {
+            // 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, type)
+                });
+            default:
+                throw new Error(language);
+        }
+    }
+    /** Returns compilation info for this shader */
+    async compilationInfo() {
+        const compilationInfo = await this.handle.getCompilationInfo();
+        return compilationInfo.messages;
     }
-  }
-
-  async compilationInfo() {
-    const compilationInfo = await this.handle.compilationInfo();
-    return compilationInfo.messages;
-  }
-
 }
-//# sourceMappingURL=webgpu-shader.js.map

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

@@ -1,5 +1,4 @@
 /// <reference types="@webgpu/types" />
-/// <reference types="offscreencanvas" />
 import { Texture, TextureProps, Sampler, SamplerProps } from '@luma.gl/api';
 import type WebGPUDevice from '../webgpu-device';
 import WebGPUSampler from './webgpu-sampler';

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

@@ -1 +1 @@
-{"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":";;AACA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAE1E,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAW7C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;gBASX,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY;IA+BrD,SAAS,CAAC,YAAY,IAAI,UAAU;IAyB3B,OAAO,IAAI,IAAI;IAIxB;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;IAKjD,OAAO,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,GAAG,CAAC;KACX;IAID,gBAAgB;IAChB,QAAQ,CAAC,OAAO,EAAE;QAChB,MAAM,EAAE,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;QAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,GAAG,YAAY,CAAC;QAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,IAAI;CA6HT"}
+{"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAE1E,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAW7C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;gBASX,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY;IA+BrD,SAAS,CAAC,YAAY,IAAI,UAAU;IAyB3B,OAAO,IAAI,IAAI;IAIxB;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;IAKjD,OAAO,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,GAAG,CAAC;KACX;IAID,gBAAgB;IAChB,QAAQ,CAAC,OAAO,EAAE;QAChB,MAAM,EAAE,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;QAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,GAAG,YAAY,CAAC;QAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,IAAI;CA6HT"}