@luma.gl/webgpu 9.1.0-alpha.9 → 9.1.0-beta.11

package/src/adapter/webgpu-device.ts

@@ -6,17 +6,16 @@
 // / <reference types="@webgpu/types" />
 
 import type {
-  DeviceProps,
   DeviceInfo,
   DeviceLimits,
   DeviceFeature,
+  DeviceTextureFormatCapabilities,
   CanvasContextProps,
   BufferProps,
   SamplerProps,
   ShaderProps,
   Texture,
   TextureProps,
-  TextureFormat,
   ExternalTextureProps,
   FramebufferProps,
   RenderPipelineProps,
@@ -28,7 +27,8 @@ import type {
   TransformFeedback,
   TransformFeedbackProps,
   QuerySet,
-  QuerySetProps
+  QuerySetProps,
+  DeviceProps
 } from '@luma.gl/core';
 import {Device, DeviceFeatures} from '@luma.gl/core';
 import {WebGPUBuffer} from './resources/webgpu-buffer';
@@ -89,8 +89,13 @@ export class WebGPUDevice extends Device {
     device.addEventListener('uncapturederror', (event: Event) => {
       // TODO is this the right way to make sure the error is an Error instance?
       const errorMessage =
-        event instanceof GPUUncapturedErrorEvent ? event.error.message : 'Unknown error';
-      this.error(new Error(errorMessage));
+        event instanceof GPUUncapturedErrorEvent ? event.error.message : 'Unknown WebGPU error';
+      this.reportError(new Error(errorMessage));
+      if (this.props.debug) {
+        // eslint-disable-next-line no-debugger
+        debugger;
+      }
+      event.preventDefault();
     });
 
     // "Context" loss handling
@@ -101,14 +106,11 @@ export class WebGPUDevice extends Device {
     });
 
     // Note: WebGPU devices can be created without a canvas, for compute shader purposes
-    // if (props.canvas) {
-    this.canvasContext = new WebGPUCanvasContext(this, this.adapter, {
-      canvas: props.canvas,
-      height: props.height,
-      width: props.width,
-      container: props.container
-    });
-    // }
+    if (props.createCanvasContext) {
+      const canvasContextProps =
+        props.createCanvasContext === true ? {} : props.createCanvasContext;
+      this.canvasContext = new WebGPUCanvasContext(this, this.adapter, canvasContextProps);
+    }
   }
 
   // TODO
@@ -120,34 +122,16 @@ export class WebGPUDevice extends Device {
     this.handle.destroy();
   }
 
-  isTextureFormatSupported(format: TextureFormat): boolean {
-    return !format.includes('webgl');
-  }
-
-  /** @todo implement proper check? */
-  isTextureFormatFilterable(format: TextureFormat): boolean {
-    return (
-      this.isTextureFormatSupported(format) &&
-      !format.startsWith('depth') &&
-      !format.startsWith('stencil')
-    );
-  }
-
-  /** @todo implement proper check? */
-  isTextureFormatRenderable(format: TextureFormat): boolean {
-    return this.isTextureFormatSupported(format);
-  }
-
   get isLost(): boolean {
     return this._isLost;
   }
 
   createBuffer(props: BufferProps | ArrayBuffer | ArrayBufferView): WebGPUBuffer {
-    const newProps = this._getBufferProps(props);
+    const newProps = this._normalizeBufferProps(props);
     return new WebGPUBuffer(this, newProps);
   }
 
-  _createTexture(props: TextureProps): WebGPUTexture {
+  createTexture(props: TextureProps): WebGPUTexture {
     return new WebGPUTexture(this, props);
   }
 
@@ -212,13 +196,17 @@ export class WebGPUDevice extends Device {
   }
 
   submit(): void {
-    // this.renderPass?.end();
     const commandBuffer = this.commandEncoder?.finish();
     if (commandBuffer) {
+      this.handle.pushErrorScope('validation');
       this.handle.queue.submit([commandBuffer]);
+      this.handle.popErrorScope().then((error: GPUError | null) => {
+        if (error) {
+          this.reportError(new Error(`WebGPU command submission failed: ${error.message}`));
+        }
+      });
     }
     this.commandEncoder = null;
-    // this.renderPass = null;
   }
 
   // PRIVATE METHODS
@@ -280,9 +268,22 @@ export class WebGPUDevice extends Device {
       features.add(feature);
     }
 
-    return new DeviceFeatures(Array.from(features), this.props.disabledFeatures);
+    return new DeviceFeatures(Array.from(features), this.props._disabledFeatures);
+  }
+
+  override _getDeviceSpecificTextureFormatCapabilities(
+    capabilities: DeviceTextureFormatCapabilities
+  ): DeviceTextureFormatCapabilities {
+    const {format} = capabilities;
+    if (format.includes('webgl')) {
+      return {format, create: false, render: false, filter: false, blend: false, store: false};
+    }
+    return capabilities;
   }
 
+  // DEPRECATED METHODS
+
+  // @deprecated
   copyExternalImageToTexture(options: {
     texture: Texture;
     mipLevel?: number;