@luma.gl/webgpu 9.1.0-beta.1 → 9.1.0-beta.12

package/dist/index.cjs

@@ -577,9 +577,9 @@ function getBindGroup(device, bindGroupLayout, shaderLayout, bindings) {
     entries
   });
 }
-function getShaderLayoutBinding(shaderLayout, bindingName, options) {
+function getShaderLayoutBinding(shaderLayout, bindingName) {
   const bindingLayout = shaderLayout.bindings.find((binding) => binding.name === bindingName || `${binding.name}uniforms` === bindingName.toLocaleLowerCase());
-  if (!bindingLayout && !(options == null ? void 0 : options.ignoreWarnings)) {
+  if (!bindingLayout) {
     import_core7.log.warn(`Binding ${bindingName} not set: Not found in shader layout.`)();
   }
   return bindingLayout || null;
@@ -591,9 +591,7 @@ function getBindGroupEntries(bindings, shaderLayout) {
     if (bindingLayout) {
       entries.push(getBindGroupEntry(value, bindingLayout.location));
     }
-    bindingLayout = getShaderLayoutBinding(shaderLayout, `${bindingName}Sampler`, {
-      ignoreWarnings: true
-    });
+    bindingLayout = getShaderLayoutBinding(shaderLayout, `${bindingName}Sampler`);
     if (bindingLayout) {
       entries.push(getBindGroupEntry(value, bindingLayout.location, { sampler: true }));
     }
@@ -698,11 +696,11 @@ function getVertexBufferLayout(shaderLayout, bufferLayout) {
 function findAttributeLayout(shaderLayout, name, attributeNames) {
   const attribute = shaderLayout.attributes.find((attribute_) => attribute_.name === name);
   if (!attribute) {
-    import_core8.log.warn(`Supplied attribute not present in shader layout: ${name}`)();
+    import_core8.log.warn(`Unknown attribute ${name}`)();
     return null;
   }
   if (attributeNames.has(name)) {
-    throw new Error(`Found multiple entries for attribute: ${name}`);
+    throw new Error(`Duplicate attribute ${name}`);
   }
   attributeNames.add(name);
   return attribute;
@@ -718,9 +716,6 @@ var WebGPURenderPipeline = class extends import_core9.RenderPipeline {
   _bindings;
   _bindGroupLayout = null;
   _bindGroup = null;
-  get [Symbol.toStringTag]() {
-    return "WebGPURenderPipeline";
-  }
   constructor(device, props) {
     super(device, props);
     this.device = device;
@@ -753,11 +748,6 @@ var WebGPURenderPipeline = class extends import_core9.RenderPipeline {
    * @todo Do we want to expose BindGroups in the API and remove this?
    */
   setBindings(bindings) {
-    for (const [name, binding] of Object.entries(bindings)) {
-      if (this._bindings[name] !== binding) {
-        this._bindGroup = null;
-      }
-    }
     Object.assign(this._bindings, bindings);
   }
   /** @todo - should this be moved to renderpass? */
@@ -807,18 +797,15 @@ var WebGPURenderPipeline = class extends import_core9.RenderPipeline {
       entryPoint: this.props.vertexEntryPoint || "main",
       buffers: getVertexBufferLayout(this.shaderLayout, this.props.bufferLayout)
     };
-    const targets = [];
-    if (this.props.colorAttachmentFormats) {
-      for (const format of this.props.colorAttachmentFormats) {
-        targets.push(format ? { format: getWebGPUTextureFormat(format) } : null);
-      }
-    } else {
-      targets.push({ format: getWebGPUTextureFormat(this.device.preferredColorFormat) });
-    }
     const fragment = {
       module: this.props.fs.handle,
       entryPoint: this.props.fragmentEntryPoint || "main",
-      targets
+      targets: [
+        {
+          // TODO exclamation mark hack!
+          format: getWebGPUTextureFormat(this.device.getCanvasContext().format)
+        }
+      ]
     };
     const descriptor = {
       vertex,
@@ -828,12 +815,6 @@ var WebGPURenderPipeline = class extends import_core9.RenderPipeline {
       },
       layout: "auto"
     };
-    const depthFormat = this.props.depthStencilAttachmentFormat || this.device.preferredDepthFormat;
-    if (this.props.parameters.depthWriteEnabled) {
-      descriptor.depthStencil = {
-        format: getWebGPUTextureFormat(depthFormat)
-      };
-    }
     applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);
     return descriptor;
   }
@@ -1183,7 +1164,11 @@ var WebGPUVertexArray = class extends import_core14.VertexArray {
 var import_core15 = require("@luma.gl/core");
 var WebGPUCanvasContext = class extends import_core15.CanvasContext {
   device;
-  handle;
+  gpuCanvasContext;
+  /** Format of returned textures: "bgra8unorm", "rgba8unorm", "rgba16float". */
+  format = navigator.gpu.getPreferredCanvasFormat();
+  /** Default stencil format for depth textures */
+  depthStencilFormat = "depth24plus";
   depthStencilAttachment = null;
   get [Symbol.toStringTag]() {
     return "WebGPUCanvasContext";
@@ -1191,56 +1176,59 @@ var WebGPUCanvasContext = class extends import_core15.CanvasContext {
   constructor(device, adapter, props) {
     super(props);
     this.device = device;
+    this.width = -1;
+    this.height = -1;
     this._setAutoCreatedCanvasId(`${this.device.id}-canvas`);
-    this.updateSize([this.drawingBufferWidth, this.drawingBufferHeight]);
+    this.gpuCanvasContext = this.canvas.getContext("webgpu");
+    this.format = "bgra8unorm";
   }
   /** Destroy any textures produced while configured and remove the context configuration. */
   destroy() {
-    this.handle.unconfigure();
+    this.gpuCanvasContext.unconfigure();
   }
   /** Update framebuffer with properly resized "swap chain" texture views */
-  getCurrentFramebuffer(options = {
-    depthStencilFormat: "depth24plus"
-  }) {
+  getCurrentFramebuffer() {
+    this.update();
     const currentColorAttachment = this.getCurrentTexture();
-    if (currentColorAttachment.width !== this.drawingBufferWidth || currentColorAttachment.height !== this.drawingBufferHeight) {
-      const [oldWidth, oldHeight] = this.getDrawingBufferSize();
-      this.drawingBufferWidth = currentColorAttachment.width;
-      this.drawingBufferHeight = currentColorAttachment.height;
-      import_core15.log.log(1, `${this}: Resized to compensate for initial canvas size mismatch ${oldWidth}x${oldHeight} => ${this.drawingBufferWidth}x${this.drawingBufferHeight}px`)();
-    }
-    if (options == null ? void 0 : options.depthStencilFormat) {
-      this._createDepthStencilAttachment(options == null ? void 0 : options.depthStencilFormat);
-    }
+    this.width = currentColorAttachment.width;
+    this.height = currentColorAttachment.height;
+    this._createDepthStencilAttachment();
     return new WebGPUFramebuffer(this.device, {
       colorAttachments: [currentColorAttachment],
       depthStencilAttachment: this.depthStencilAttachment
     });
   }
   /** Resizes and updates render targets if necessary */
-  updateSize(size) {
-    if (this.depthStencilAttachment) {
-      this.depthStencilAttachment.destroy();
-      this.depthStencilAttachment = null;
+  update() {
+    const oldWidth = this.width;
+    const oldHeight = this.height;
+    const [newWidth, newHeight] = this.getPixelSize();
+    const sizeChanged = newWidth !== oldWidth || newHeight !== oldHeight;
+    if (sizeChanged) {
+      this.width = newWidth;
+      this.height = newHeight;
+      if (this.depthStencilAttachment) {
+        this.depthStencilAttachment.destroy();
+        this.depthStencilAttachment = null;
+      }
+      this.gpuCanvasContext.configure({
+        device: this.device.handle,
+        format: getWebGPUTextureFormat(this.format),
+        // Can be used to define e.g. -srgb views
+        // viewFormats: [...]
+        colorSpace: this.props.colorSpace,
+        alphaMode: this.props.alphaMode
+      });
+      import_core15.log.log(1, `${this} Resized ${oldWidth}x${oldHeight} => ${newWidth}x${newHeight}px`)();
     }
-    this.handle.configure({
-      device: this.device.handle,
-      format: this.device.preferredColorFormat,
-      // Can be used to define e.g. -srgb views
-      // viewFormats: [...]
-      colorSpace: this.props.colorSpace,
-      alphaMode: this.props.alphaMode
-    });
   }
   resize(options) {
+    this.update();
     if (!this.device.handle)
       return;
-    if (this.props.autoResize) {
-      return;
-    }
     if (this.canvas) {
       const devicePixelRatio = this.getDevicePixelRatio(options == null ? void 0 : options.useDevicePixels);
-      this._setDevicePixelRatio(devicePixelRatio, options);
+      this.setDevicePixelRatio(devicePixelRatio, options);
       return;
     }
   }
@@ -1248,19 +1236,19 @@ var WebGPUCanvasContext = class extends import_core15.CanvasContext {
   getCurrentTexture() {
     return this.device.createTexture({
       id: `${this.id}#color-texture`,
-      handle: this.handle.getCurrentTexture(),
-      format: this.device.preferredColorFormat
+      handle: this.gpuCanvasContext.getCurrentTexture(),
+      format: this.format
     });
   }
   /** We build render targets on demand (i.e. not when size changes but when about to render) */
-  _createDepthStencilAttachment(depthStencilFormat) {
+  _createDepthStencilAttachment() {
     if (!this.depthStencilAttachment) {
       this.depthStencilAttachment = this.device.createTexture({
         id: `${this.id}#depth-stencil-texture`,
-        usage: import_core15.Texture.RENDER_ATTACHMENT,
-        format: depthStencilFormat,
-        width: this.drawingBufferWidth,
-        height: this.drawingBufferHeight
+        format: this.depthStencilFormat,
+        width: this.width,
+        height: this.height,
+        usage: GPUTextureUsage.RENDER_ATTACHMENT
       });
     }
     return this.depthStencilAttachment;
@@ -1290,25 +1278,22 @@ var WebGPUQuerySet = class extends import_core16.QuerySet {
 
 // dist/adapter/webgpu-device.js
 var WebGPUDevice = class extends import_core17.Device {
-  /** The underlying WebGPU device */
-  handle;
   /** type of this device */
   type = "webgpu";
-  preferredColorFormat = navigator.gpu.getPreferredCanvasFormat();
-  preferredDepthFormat = "depth24plus";
+  /** The underlying WebGPU device */
+  handle;
+  /* The underlying WebGPU adapter */
+  adapter;
+  /* The underlying WebGPU adapter's info */
+  adapterInfo;
   features;
   info;
   limits;
   lost;
-  renderPass = null;
-  canvasContext;
+  canvasContext = null;
   _isLost = false;
-  // canvasContext: WebGPUCanvasContext | null = null;
   commandEncoder = null;
-  /* The underlying WebGPU adapter */
-  adapter;
-  /* The underlying WebGPU adapter's info */
-  adapterInfo;
+  renderPass = null;
   constructor(props, device, adapter, adapterInfo) {
     super({ ...props, id: props.id || "webgpu-device" });
     this.handle = device;
@@ -1521,6 +1506,7 @@ var WebGPUAdapter = class extends import_core18.Adapter {
     return Boolean(typeof navigator !== "undefined" && navigator.gpu);
   }
   async create(props) {
+    var _a;
     if (!navigator.gpu) {
       throw new Error("WebGPU not available. Open in Chrome Canary and turn on chrome://flags/#enable-unsafe-webgpu");
     }
@@ -1532,7 +1518,8 @@ var WebGPUAdapter = class extends import_core18.Adapter {
     if (!adapter) {
       throw new Error("Failed to request WebGPU adapter");
     }
-    const adapterInfo = await adapter.requestAdapterInfo();
+    const adapterInfo = adapter.info || // @ts-ignore Chrome has removed this function
+    await ((_a = adapter.requestAdapterInfo) == null ? void 0 : _a.call(adapter));
     import_core18.log.probe(2, "Adapter available", adapterInfo)();
     const requiredFeatures = [];
     const requiredLimits = {};