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

package/src/adapter/helpers/get-vertex-buffer-layout.ts

@@ -1,4 +1,4 @@
-import type {ShaderLayout, BufferMapping, AttributeLayout, VertexFormat} from '@luma.gl/core';
+import type {ShaderLayout, BufferLayout, AttributeDeclaration, VertexFormat} from '@luma.gl/core';
 import {decodeVertexFormat} from '@luma.gl/core';
 
 /** Throw error on any WebGL-only vertex formats */
@@ -13,15 +13,18 @@ function getWebGPUVertexFormat(format: VertexFormat): GPUVertexFormat {
  * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.
  * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array
  * @param layout
- * @param bufferMap The buffer map is optional
+ * @param bufferLayout The buffer map is optional
  * @returns WebGPU layout intended for a GPURenderPassDescriptor.
  */
-export function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMapping[]): GPUVertexBufferLayout[] {
+export function getVertexBufferLayout(
+  shaderLayout: ShaderLayout,
+  bufferLayout: BufferLayout[]
+): GPUVertexBufferLayout[] {
   const vertexBufferLayouts: GPUVertexBufferLayout[] = [];
   const usedAttributes = new Set<string>();
 
-  // First handle any buffers mentioned in `bufferMapping`
-  for (const mapping of bufferMap) {
+  // First handle any buffers mentioned in `bufferLayout`
+  for (const mapping of bufferLayout) {
     // Build vertex attributes for one buffer
     const vertexAttributes: GPUVertexAttribute[] = [];
 
@@ -31,28 +34,28 @@ export function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMap
     const byteOffset = mapping.byteOffset || 0;
 
     // interleaved mapping {..., attributes: [{...}, ...]}
-    if ('attributes' in mapping) {
-      // const arrayStride = mapping.byteStride; TODO 
+    if (mapping.attributes) {
+      // const arrayStride = mapping.byteStride; TODO
       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;
       }
       // non-interleaved mapping (just set offset and stride)
     } 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
       });
@@ -66,17 +69,19 @@ export function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMap
     });
   }
 
-  // Add any non-mapped attributes
-  for (const attribute of layout.attributes) {
+  // Add any non-mapped attributes - TODO - avoid hardcoded types
+  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),
-          offset: 0,
-          shaderLocation: attribute.location
-        }]
+        attributes: [
+          {
+            format: getWebGPUVertexFormat('float32x3'),
+            offset: 0,
+            shaderLocation: attribute.location
+          }
+        ]
       });
     }
   }
@@ -84,13 +89,16 @@ export function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMap
   return vertexBufferLayouts;
 }
 
-export function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[]): Record<string, number> {
+export function getBufferSlots(
+  shaderLayout: ShaderLayout,
+  bufferLayout: BufferLayout[]
+): Record<string, number> {
   const usedAttributes = new Set<string>();
   let bufferSlot = 0;
   const bufferSlots: Record<string, number> = {};
 
-  // First handle any buffers mentioned in `bufferMapping`
-  for (const mapping of bufferMap) {
+  // First handle any buffers mentioned in `bufferLayout`
+  for (const mapping of bufferLayout) {
     // interleaved mapping {..., attributes: [{...}, ...]}
     if ('attributes' in mapping) {
       for (const interleaved of mapping.attributes) {
@@ -104,7 +112,7 @@ export function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[])
   }
 
   // Add any non-mapped attributes
-  for (const attribute of layout.attributes) {
+  for (const attribute of shaderLayout.attributes) {
     if (!usedAttributes.has(attribute.name)) {
       bufferSlots[attribute.name] = bufferSlot++;
     }
@@ -118,8 +126,12 @@ export function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[])
  * @throws if name is not in ShaderLayout
  * @throws if name has already been referenced
  */
-function findAttributeLayout(layout: ShaderLayout, name: string, attributeNames: Set<string>): AttributeLayout {
-  const attribute = layout.attributes.find(attribute => attribute.name === name);
+function findAttributeLayout(
+  shaderLayout: ShaderLayout,
+  name: string,
+  attributeNames: Set<string>
+): AttributeDeclaration {
+  const attribute = shaderLayout.attributes.find(attribute => attribute.name === name);
   if (!attribute) {
     throw new Error(`Unknown attribute ${name}`);
   }

package/src/adapter/resources/webgpu-command-encoder.ts

@@ -13,7 +13,7 @@ export class WebGPUCommandEncoder extends CommandEncoder {
   readonly handle: GPUCommandEncoder;
 
   constructor(device: WebGPUDevice, props: CommandEncoderProps) {
-    super(props);
+    super(device, props);
     this.device = device;
     this.handle = props.handle || this.device.handle.createCommandEncoder({
       // TODO was this removed in standard?

package/src/adapter/resources/webgpu-render-pipeline.ts

@@ -44,7 +44,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     this.vs = cast<WebGPUShader>(props.vs);
     this.fs = cast<WebGPUShader>(props.fs);
 
-    this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);
+    this._bufferSlots = getBufferSlots(this.props.shaderLayout, this.props.bufferLayout);
     this._buffers = new Array<Buffer>(Object.keys(this._bufferSlots).length).fill(null);
     this._bindGroupLayout = this.handle.getBindGroupLayout(0);
   }
@@ -87,7 +87,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
 
   /** Constant attributes are not available in WebGPU */
   setConstantAttributes(attributes: Record<string, TypedArray>): void {
-    console.error('not implemented');
+    throw new Error('not implemented');
   }
 
   /** Set the bindings */
@@ -98,7 +98,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
       this._bindGroup = getBindGroup(
         this.device.handle,
         this._bindGroupLayout,
-        this.props.layout,
+        this.props.shaderLayout,
         this.props.bindings
       );
     }
@@ -126,7 +126,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     const vertex: GPUVertexState = {
       module: cast<WebGPUShader>(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)
     };
 
     // Set up the fragment stage
@@ -221,7 +221,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     for (let i = 0; i < buffers.length; ++i) {
       const buffer = cast<WebGPUBuffer>(buffers[i]);
       if (!buffer) {
-        const attribute = this.props.layout.attributes.find(
+        const attribute = this.props.shaderLayout.attributes.find(
           (attribute) => attribute.location === i
         );
         throw new Error(
@@ -233,7 +233,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
 
     // TODO - HANDLE buffer maps
     /*
-    for (const [bufferName, attributeMapping] of Object.entries(this.props.bufferMap)) {
+    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}`)();