@luma.gl/webgpu 9.1.1 → 9.1.3

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

@@ -37,7 +37,7 @@ export function getVertexBufferLayout(
     let stepMode: 'vertex' | 'instance' = 'vertex';
     let byteStride = 0;
     // @ts-ignore
-    const format: VertexFormat = mapping.format;
+    let format: VertexFormat = mapping.format;
 
     // interleaved mapping {..., attributes: [{...}, ...]}
     if (mapping.attributes) {
@@ -48,12 +48,13 @@ export function getVertexBufferLayout(
 
         // @ts-ignore
         const location: number = attributeLayout?.location;
+        format = attributeMapping.format || mapping.format;
 
         stepMode =
           attributeLayout?.stepMode ||
           (attributeLayout?.name.startsWith('instance') ? 'instance' : 'vertex');
         vertexAttributes.push({
-          format: getWebGPUVertexFormat(attributeMapping.format || mapping.format),
+          format: getWebGPUVertexFormat(format),
           offset: attributeMapping.byteOffset,
           shaderLocation: location
         });

package/src/adapter/helpers/webgpu-parameters.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Parameters} from '@luma.gl/core';
+import {Parameters, log} from '@luma.gl/core';
 
 function addDepthStencil(descriptor: GPURenderPipelineDescriptor): GPUDepthStencilState {
   descriptor.depthStencil = descriptor.depthStencil || {
@@ -297,19 +297,22 @@ function setParameters(
   for (const [key, value] of Object.entries(parameters)) {
     const setterFunction = PARAMETER_TABLE[key as keyof Parameters];
     if (!setterFunction) {
-      throw new Error(`Illegal parameter ${key}`);
+      log.warn(`Illegal parameter ${key}`)();
+      continue;
     }
     setterFunction(key, value, pipelineDescriptor);
   }
 }
 
 function addColorState(descriptor: GPURenderPipelineDescriptor): GPUColorTargetState[] {
-  // @ts-ignore
+  // @ts-ignore GPU types as iterator
   descriptor.fragment.targets = descriptor.fragment?.targets || [];
   if (!Array.isArray(descriptor.fragment?.targets)) {
-    throw new Error('colorstate');
+    log.warn('parameters: no targets array')();
   }
+  // @ts-expect-error GPU types as iterator
   if (descriptor.fragment?.targets?.length === 0) {
+    // @ts-expect-error GPU types as iterator
     descriptor.fragment.targets?.push({});
   }
   return descriptor.fragment?.targets as GPUColorTargetState[];

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import type {TypedArray, NumberArray4} from '@math.gl/types';
 import type {RenderPassProps, RenderPassParameters, Binding} from '@luma.gl/core';
 import {Buffer, RenderPass, RenderPipeline, log} from '@luma.gl/core';
 import {WebGPUDevice} from '../webgpu-device';
@@ -182,8 +183,9 @@ export class WebGPURenderPass extends RenderPass {
       (colorAttachment, index) => ({
         // clear values
         loadOp: this.props.clearColor !== false ? 'clear' : 'load',
-        colorClearValue:
-          this.props.clearColors?.[index] || this.props.clearColor || RenderPass.defaultClearColor,
+        clearValue: convertColor(
+          this.props.clearColors?.[index] || this.props.clearColor || RenderPass.defaultClearColor
+        ),
         storeOp: this.props.discard ? 'discard' : 'store',
         // ...colorAttachment,
         view: colorAttachment.handle
@@ -226,3 +228,7 @@ export class WebGPURenderPass extends RenderPass {
     return renderPassDescriptor;
   }
 }
+
+function convertColor(color: TypedArray | NumberArray4): GPUColor {
+  return {r: color[0], g: color[1], b: color[2], a: color[3]};
+}

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

@@ -178,6 +178,14 @@ export class WebGPURenderPipeline extends RenderPipeline {
       layout: 'auto'
     };
 
+    if (this.props.parameters.depthWriteEnabled && this.props.parameters.depthCompare) {
+      descriptor.depthStencil = {
+        format: 'depth24plus',
+        depthWriteEnabled: this.props.parameters.depthWriteEnabled,
+        depthCompare: this.props.parameters.depthCompare
+      };
+    }
+
     // Set parameters on the descriptor
     applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);
 

package/src/adapter/webgpu-device.ts

@@ -106,9 +106,8 @@ export class WebGPUDevice extends Device {
     });
 
     // Note: WebGPU devices can be created without a canvas, for compute shader purposes
-    if (props.createCanvasContext) {
-      const canvasContextProps =
-        props.createCanvasContext === true ? {} : props.createCanvasContext;
+    const canvasContextProps = Device._getCanvasContextProps(props);
+    if (canvasContextProps) {
       this.canvasContext = new WebGPUCanvasContext(this, this.adapter, canvasContextProps);
     }
   }