@luma.gl/webgpu 9.0.0-alpha.30 → 9.0.0-alpha.31

package/dist/dist.dev.js

@@ -820,11 +820,6 @@ var __exports__ = (() => {
   }
 
   // ../core/src/adapter/resources/resource.ts
-  var DEFAULT_RESOURCE_PROPS = {
-    id: "undefined",
-    handle: void 0,
-    userData: void 0
-  };
   var Resource = class {
     /** props.id, for debugging. */
     userData = {};
@@ -936,7 +931,11 @@ var __exports__ = (() => {
     }
   };
   /** Default properties for resource */
-  __publicField(Resource, "defaultProps", DEFAULT_RESOURCE_PROPS);
+  __publicField(Resource, "defaultProps", {
+    id: "undefined",
+    handle: void 0,
+    userData: void 0
+  });
   function selectivelyMerge(props, defaultProps) {
     const mergedProps = {
       ...defaultProps
@@ -950,16 +949,6 @@ var __exports__ = (() => {
   }
 
   // ../core/src/adapter/resources/buffer.ts
-  var DEFAULT_BUFFER_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
-    usage: 0,
-    // Buffer.COPY_DST | Buffer.COPY_SRC
-    byteLength: 0,
-    byteOffset: 0,
-    data: null,
-    indexType: "uint16",
-    mappedAtCreation: false
-  };
   var _Buffer = class extends Resource {
     get [Symbol.toStringTag]() {
       return "Buffer";
@@ -976,7 +965,7 @@ var __exports__ = (() => {
           deducedProps.indexType = "uint16";
         }
       }
-      super(device, deducedProps, DEFAULT_BUFFER_PROPS);
+      super(device, deducedProps, _Buffer.defaultProps);
     }
     write(data, byteOffset) {
       throw new Error("not implemented");
@@ -1034,6 +1023,16 @@ var __exports__ = (() => {
     // abstract unmap(): void;
   };
   var Buffer2 = _Buffer;
+  __publicField(Buffer2, "defaultProps", {
+    ...Resource.defaultProps,
+    usage: 0,
+    // Buffer.COPY_DST | Buffer.COPY_SRC
+    byteLength: 0,
+    byteOffset: 0,
+    data: null,
+    indexType: "uint16",
+    mappedAtCreation: false
+  });
   // Usage Flags
   __publicField(Buffer2, "MAP_READ", 1);
   __publicField(Buffer2, "MAP_WRITE", 2);
@@ -1083,8 +1082,14 @@ var __exports__ = (() => {
       };
       this.id = this.props.id || uid(this[Symbol.toStringTag].toLowerCase());
     }
+    /** id of this device, primarily for debugging */
+    /** stats */
     statsManager = lumaStats;
+    /** A copy of the device props  */
+    /** Available for the application to store data on the device */
     userData = {};
+    /** Used by other luma.gl modules to store data on the device */
+    _lumaData = {};
     // Capabilities
     /** Information about the device (vendor, versions etc) */
     /** Optional capability discovery */
@@ -1431,25 +1436,7 @@ var __exports__ = (() => {
   }
 
   // ../core/src/adapter/resources/texture.ts
-  var DEFAULT_TEXTURE_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
-    data: null,
-    dimension: "2d",
-    format: "rgba8unorm",
-    width: void 0,
-    height: void 0,
-    depth: 1,
-    mipmaps: true,
-    sampler: {},
-    // type: undefined,
-    compressed: false,
-    // mipLevels: 1,
-    usage: 0,
-    mipLevels: void 0,
-    samples: void 0,
-    type: void 0
-  };
-  var Texture = class extends Resource {
+  var _Texture = class extends Resource {
     get [Symbol.toStringTag]() {
       return "Texture";
     }
@@ -1459,7 +1446,7 @@ var __exports__ = (() => {
     /** height in pixels of this texture */
     /** depth of this texture */
     /** Default sampler for this texture */
-    constructor(device, props, defaultProps = DEFAULT_TEXTURE_PROPS) {
+    constructor(device, props, defaultProps = _Texture.defaultProps) {
       super(device, props, defaultProps);
       this.dimension = this.props.dimension;
       this.format = this.props.format;
@@ -1468,6 +1455,26 @@ var __exports__ = (() => {
       this.depth = this.props.depth;
     }
   };
+  var Texture = _Texture;
+  __publicField(Texture, "defaultProps", {
+    ...Resource.defaultProps,
+    data: null,
+    dimension: "2d",
+    format: "rgba8unorm",
+    width: void 0,
+    height: void 0,
+    depth: 1,
+    mipmaps: true,
+    sampler: {},
+    // type: undefined,
+    compressed: false,
+    // mipLevels: 1,
+    usage: 0,
+    // usage: GPUTextureUsage.COPY_DST
+    mipLevels: void 0,
+    samples: void 0,
+    type: void 0
+  });
   __publicField(Texture, "COPY_SRC", 1);
   __publicField(Texture, "COPY_DST", 2);
   __publicField(Texture, "TEXTURE_BINDING", 4);
@@ -1475,43 +1482,54 @@ var __exports__ = (() => {
   __publicField(Texture, "RENDER_ATTACHMENT", 16);
 
   // ../core/src/adapter/resources/external-texture.ts
-  var DEFAULT_TEXTURE_PROPS2 = {
-    ...DEFAULT_RESOURCE_PROPS,
-    source: null,
-    colorSpace: "srgb"
-  };
-  var ExternalTexture = class extends Resource {
+  var _ExternalTexture = class extends Resource {
     get [Symbol.toStringTag]() {
       return "ExternalTexture";
     }
     constructor(device, props) {
-      super(device, props, DEFAULT_TEXTURE_PROPS2);
+      super(device, props, _ExternalTexture.defaultProps);
     }
   };
+  var ExternalTexture = _ExternalTexture;
+  __publicField(ExternalTexture, "defaultProps", {
+    ...Resource.defaultProps,
+    source: null,
+    colorSpace: "srgb"
+  });
 
   // ../core/src/adapter/resources/shader.ts
-  var DEFAULT_SHADER_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
-    stage: "vertex",
-    source: "",
-    sourceMap: null,
-    language: "glsl",
-    shaderType: 0
-  };
-  var Shader = class extends Resource {
+  var _Shader = class extends Resource {
     get [Symbol.toStringTag]() {
       return "Shader";
     }
     constructor(device, props) {
-      super(device, props, DEFAULT_SHADER_PROPS);
+      super(device, props, _Shader.defaultProps);
       this.stage = this.props.stage;
       this.source = this.props.source;
     }
   };
+  var Shader = _Shader;
+  __publicField(Shader, "defaultProps", {
+    ...Resource.defaultProps,
+    stage: "vertex",
+    source: "",
+    sourceMap: null,
+    language: "glsl",
+    shaderType: 0
+  });
 
   // ../core/src/adapter/resources/sampler.ts
-  var DEFAULT_SAMPLER_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
+  var _Sampler = class extends Resource {
+    get [Symbol.toStringTag]() {
+      return "Sampler";
+    }
+    constructor(device, props) {
+      super(device, props, _Sampler.defaultProps);
+    }
+  };
+  var Sampler = _Sampler;
+  __publicField(Sampler, "defaultProps", {
+    ...Resource.defaultProps,
     type: "color-sampler",
     addressModeU: "clamp-to-edge",
     addressModeV: "clamp-to-edge",
@@ -1524,27 +1542,10 @@ var __exports__ = (() => {
     // Per WebGPU spec
     compare: "less-equal",
     maxAnisotropy: 1
-  };
-  var Sampler = class extends Resource {
-    get [Symbol.toStringTag]() {
-      return "Sampler";
-    }
-    constructor(device, props) {
-      super(device, props, DEFAULT_SAMPLER_PROPS);
-    }
-  };
+  });
 
   // ../core/src/adapter/resources/framebuffer.ts
-  var DEFAULT_FRAMEBUFFER_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
-    width: 1,
-    height: 1,
-    colorAttachments: [],
-    // ['rgba8unorm-unsized'],
-    depthStencilAttachment: null
-    // 'depth24plus-stencil8'
-  };
-  var Framebuffer = class extends Resource {
+  var _Framebuffer = class extends Resource {
     get [Symbol.toStringTag]() {
       return "Framebuffer";
     }
@@ -1555,7 +1556,7 @@ var __exports__ = (() => {
     /** Depth-stencil attachment, if provided */
     depthStencilAttachment = null;
     constructor(device, props = {}) {
-      super(device, props, DEFAULT_FRAMEBUFFER_PROPS);
+      super(device, props, _Framebuffer.defaultProps);
       this.width = this.props.width;
       this.height = this.props.height;
     }
@@ -1721,10 +1722,36 @@ var __exports__ = (() => {
     }
     */
   };
+  var Framebuffer = _Framebuffer;
+  __publicField(Framebuffer, "defaultProps", {
+    ...Resource.defaultProps,
+    width: 1,
+    height: 1,
+    colorAttachments: [],
+    // ['rgba8unorm-unsized'],
+    depthStencilAttachment: null
+    // 'depth24plus-stencil8'
+  });
 
   // ../core/src/adapter/resources/render-pipeline.ts
-  var DEFAULT_RENDER_PIPELINE_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
+  var _RenderPipeline = class extends Resource {
+    get [Symbol.toStringTag]() {
+      return "RenderPipeline";
+    }
+    hash = "";
+    constructor(device, props) {
+      super(device, props, _RenderPipeline.defaultProps);
+    }
+    /** Set attributes (stored on pipeline and set before each call) */
+    /** Set attributes (stored on pipeline and set before each call) */
+    /** Set constant attributes (WebGL only) */
+    /** Set bindings (stored on pipeline and set before each call) */
+    /** Uniforms (only supported on WebGL devices. Reset before each call to enable pipeline sharing) */
+    /** Draw call */
+  };
+  var RenderPipeline = _RenderPipeline;
+  __publicField(RenderPipeline, "defaultProps", {
+    ...Resource.defaultProps,
     vs: null,
     vsEntryPoint: "",
     // main
@@ -1733,54 +1760,36 @@ var __exports__ = (() => {
     fsEntryPoint: "",
     // main
     fsConstants: {},
-    layout: null,
-    // {attributes: [], bindings: []},
+    shaderLayout: null,
+    bufferLayout: [],
     topology: "triangle-list",
-    // targets:
     parameters: {},
-    bufferMap: [],
     vertexCount: 0,
     instanceCount: 0,
     indices: null,
     attributes: {},
     bindings: {},
     uniforms: {}
-  };
-  var RenderPipeline = class extends Resource {
-    get [Symbol.toStringTag]() {
-      return "RenderPipeline";
-    }
-    hash = "";
-    constructor(device, props) {
-      super(device, props, DEFAULT_RENDER_PIPELINE_PROPS);
-    }
-  };
-  /** Set attributes (stored on pipeline and set before each call) */
-  /** Set attributes (stored on pipeline and set before each call) */
-  /** Set constant attributes (WebGL only) */
-  /** Set bindings (stored on pipeline and set before each call) */
-  /** Uniforms (only supported on WebGL devices. Reset before each call to enable pipeline sharing) */
-  /** Draw call */
-  /** Private "export" for Model class */
-  __publicField(RenderPipeline, "_DEFAULT_PROPS", DEFAULT_RENDER_PIPELINE_PROPS);
+  });
 
   // ../core/src/adapter/resources/compute-pipeline.ts
-  var DEFAULT_COMPUTE_PIPELINE_PROPS = {
-    ...DEFAULT_RESOURCE_PROPS,
-    // cs: undefined,
-    // csEntryPoint: undefined,
-    csConstants: {},
-    layout: []
-  };
-  var ComputePipeline = class extends Resource {
+  var _ComputePipeline = class extends Resource {
     get [Symbol.toStringTag]() {
       return "ComputePipeline";
     }
     hash = "";
     constructor(device, props) {
-      super(device, props, DEFAULT_COMPUTE_PIPELINE_PROPS);
+      super(device, props, _ComputePipeline.defaultProps);
     }
   };
+  var ComputePipeline = _ComputePipeline;
+  __publicField(ComputePipeline, "defaultProps", {
+    ...Resource.defaultProps,
+    cs: void 0,
+    csEntryPoint: void 0,
+    csConstants: {},
+    shaderLayout: []
+  });
 
   // ../core/src/adapter/resources/render-pass.ts
   var _RenderPass = class extends Resource {
@@ -1845,7 +1854,7 @@ var __exports__ = (() => {
       return "ComputePass";
     }
     constructor(device, props) {
-      super(device, props, DEFAULT_RESOURCE_PROPS);
+      super(device, props, Resource.defaultProps);
     }
     /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
     // abstract setBindings(bindings: Binding[]): void;
@@ -1864,8 +1873,11 @@ var __exports__ = (() => {
     // beginPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
     // endPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
   };
+  __publicField(ComputePass, "defaultProps", {
+    ...Resource.defaultProps
+  });
 
-  // ../core/src/adapter/utils/decode-data-type.ts
+  // ../core/src/adapter/type-utils/decode-data-type.ts
   function decodeVertexType(type) {
     const dataType = TYPE_MAP[type];
     const bytes = getDataTypeBytes(dataType);
@@ -1909,7 +1921,7 @@ var __exports__ = (() => {
     sint32: 4
   };
 
-  // ../core/src/adapter/utils/decode-vertex-format.ts
+  // ../core/src/adapter/type-utils/decode-vertex-format.ts
   function decodeVertexFormat(format) {
     let webglOnly;
     if (format.endsWith("-webgl")) {
@@ -2471,24 +2483,24 @@ var __exports__ = (() => {
   }
 
   // src/adapter/helpers/get-bind-group.ts
-  function getBindGroup(device, bindGroupLayout, layout, bindings) {
-    const entries = getBindGroupEntries(bindings, layout);
+  function getBindGroup(device, bindGroupLayout, shaderLayout, bindings) {
+    const entries = getBindGroupEntries(bindings, shaderLayout);
     return device.createBindGroup({
       layout: bindGroupLayout,
       entries
     });
   }
-  function getShaderLayoutBinding(layout, bindingName) {
-    const bindingLayout = layout.bindings.find((binding) => binding.name === bindingName);
+  function getShaderLayoutBinding(shaderLayout, bindingName) {
+    const bindingLayout = shaderLayout.bindings.find((binding) => binding.name === bindingName);
     if (!bindingLayout) {
       log.warn(`Binding ${bindingName} not set: Not found in shader layout.`)();
     }
     return bindingLayout;
   }
-  function getBindGroupEntries(bindings, layout) {
+  function getBindGroupEntries(bindings, shaderLayout) {
     const entries = [];
     for (const [bindingName, value] of Object.entries(bindings)) {
-      const bindingLayout = getShaderLayoutBinding(layout, bindingName);
+      const bindingLayout = getShaderLayoutBinding(shaderLayout, bindingName);
       if (bindingLayout) {
         entries.push(getBindGroupEntry(value, bindingLayout.location));
       }
@@ -2525,31 +2537,31 @@ var __exports__ = (() => {
     }
     return format;
   }
-  function getVertexBufferLayout(layout, bufferMap) {
+  function getVertexBufferLayout(shaderLayout, bufferLayout) {
     const vertexBufferLayouts = [];
     const usedAttributes = /* @__PURE__ */ new Set();
-    for (const mapping of bufferMap) {
+    for (const mapping of bufferLayout) {
       const vertexAttributes = [];
       let stepMode = "vertex";
       let byteStride = 0;
       const byteOffset = mapping.byteOffset || 0;
-      if ("attributes" in mapping) {
+      if (mapping.attributes) {
         for (const interleaved of mapping.attributes) {
-          const attributeLayout = findAttributeLayout(layout, interleaved.name, usedAttributes);
+          const attributeLayout = findAttributeLayout(shaderLayout, interleaved.name, usedAttributes);
           stepMode = attributeLayout.stepMode || "vertex";
           vertexAttributes.push({
-            format: getWebGPUVertexFormat(attributeLayout.format),
+            format: getWebGPUVertexFormat(interleaved.format || mapping.format),
             offset: byteOffset + byteStride,
             shaderLocation: attributeLayout.location
           });
-          byteStride += decodeVertexFormat(attributeLayout.format).byteLength;
+          byteStride += decodeVertexFormat(mapping.format).byteLength;
         }
       } else {
-        const attributeLayout = findAttributeLayout(layout, mapping.name, usedAttributes);
-        byteStride = decodeVertexFormat(attributeLayout.format).byteLength;
+        const attributeLayout = findAttributeLayout(shaderLayout, mapping.name, usedAttributes);
+        byteStride = decodeVertexFormat(mapping.format).byteLength;
         stepMode = attributeLayout.stepMode || "vertex";
         vertexAttributes.push({
-          format: getWebGPUVertexFormat(attributeLayout.format),
+          format: getWebGPUVertexFormat(mapping.format),
           offset: byteOffset,
           shaderLocation: attributeLayout.location
         });
@@ -2560,13 +2572,13 @@ var __exports__ = (() => {
         attributes: vertexAttributes
       });
     }
-    for (const attribute of layout.attributes) {
+    for (const attribute of shaderLayout.attributes) {
       if (!usedAttributes.has(attribute.name)) {
         vertexBufferLayouts.push({
-          arrayStride: decodeVertexFormat(attribute.format).byteLength,
+          arrayStride: decodeVertexFormat("float32x3").byteLength,
           stepMode: attribute.stepMode || "vertex",
           attributes: [{
-            format: getWebGPUVertexFormat(attribute.format),
+            format: getWebGPUVertexFormat("float32x3"),
             offset: 0,
             shaderLocation: attribute.location
           }]
@@ -2575,11 +2587,11 @@ var __exports__ = (() => {
     }
     return vertexBufferLayouts;
   }
-  function getBufferSlots(layout, bufferMap) {
+  function getBufferSlots(shaderLayout, bufferLayout) {
     const usedAttributes = /* @__PURE__ */ new Set();
     let bufferSlot = 0;
     const bufferSlots = {};
-    for (const mapping of bufferMap) {
+    for (const mapping of bufferLayout) {
       if ("attributes" in mapping) {
         for (const interleaved of mapping.attributes) {
           usedAttributes.add(interleaved.name);
@@ -2589,15 +2601,15 @@ var __exports__ = (() => {
       }
       bufferSlots[mapping.name] = bufferSlot++;
     }
-    for (const attribute of layout.attributes) {
+    for (const attribute of shaderLayout.attributes) {
       if (!usedAttributes.has(attribute.name)) {
         bufferSlots[attribute.name] = bufferSlot++;
       }
     }
     return bufferSlots;
   }
-  function findAttributeLayout(layout, name, attributeNames) {
-    const attribute = layout.attributes.find((attribute2) => attribute2.name === name);
+  function findAttributeLayout(shaderLayout, name, attributeNames) {
+    const attribute = shaderLayout.attributes.find((attribute2) => attribute2.name === name);
     if (!attribute) {
       throw new Error(`Unknown attribute ${name}`);
     }
@@ -2623,7 +2635,7 @@ var __exports__ = (() => {
       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._bufferSlots = getBufferSlots(this.props.shaderLayout, this.props.bufferLayout);
       this._buffers = new Array(Object.keys(this._bufferSlots).length).fill(null);
       this._bindGroupLayout = this.handle.getBindGroupLayout(0);
     }
@@ -2652,13 +2664,13 @@ var __exports__ = (() => {
     }
     /** Constant attributes are not available in WebGPU */
     setConstantAttributes(attributes) {
-      console.error("not implemented");
+      throw new Error("not implemented");
     }
     /** Set the bindings */
     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);
+        this._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this.props.bindings);
       }
     }
     setUniforms(uniforms) {
@@ -2678,7 +2690,7 @@ var __exports__ = (() => {
       const vertex = {
         module: cast(this.props.vs).handle,
         entryPoint: this.props.vsEntryPoint || "main",
-        buffers: getVertexBufferLayout(this.props.layout, this.props.bufferMap)
+        buffers: getVertexBufferLayout(this.props.shaderLayout, this.props.bufferLayout)
       };
       let fragment;
       if (this.props.fs) {
@@ -2730,7 +2742,7 @@ var __exports__ = (() => {
       for (let i = 0; i < buffers.length; ++i) {
         const buffer = cast(buffers[i]);
         if (!buffer) {
-          const attribute = this.props.layout.attributes.find((attribute2) => attribute2.location === i);
+          const attribute = this.props.shaderLayout.attributes.find((attribute2) => attribute2.location === i);
           throw new Error(`No buffer provided for attribute '${attribute?.name || ""}' in Model '${this.props.id}'`);
         }
         webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);