@luma.gl/webgpu 9.0.0-alpha.21 → 9.0.0-alpha.24

package/dist/index.cjs

@@ -189,6 +189,8 @@ var WebGPUTexture = class extends import_api3.Texture {
     if (this.props.data) {
       this.setData({ data: this.props.data });
     }
+    this.width = this.handle.width;
+    this.height = this.handle.height;
     this.sampler = props.sampler instanceof WebGPUSampler ? props.sampler : new WebGPUSampler(this.device, props.sampler);
     this.view = this.handle.createView({
       // format: this.props.format,
@@ -273,7 +275,7 @@ var WebGPUTexture = class extends import_api3.Texture {
         depth
       ]
     );
-    return this;
+    return { width, height };
   }
   /*
     async readPixels() {
@@ -403,7 +405,7 @@ var WebGPUShader = class extends import_api5.Shader {
   destroy() {
   }
   createHandle() {
-    const { source } = this.props;
+    const { source, stage } = this.props;
     let language = this.props.language;
     if (!language) {
       language = source.includes("->") ? "wgsl" : "glsl";
@@ -415,7 +417,7 @@ var WebGPUShader = class extends import_api5.Shader {
         return this.device.handle.createShaderModule({
           code: source,
           // @ts-expect-error
-          transform: (glsl) => this.device.glslang.compileGLSL(glsl, type)
+          transform: (glsl) => this.device.glslang.compileGLSL(glsl, stage)
         });
       default:
         throw new Error(language);
@@ -932,7 +934,7 @@ var WebGPURenderPass = class extends import_api10.RenderPass {
     this.pipeline = null;
     this.device = device;
     const framebuffer = props.framebuffer || device.canvasContext.getCurrentFramebuffer();
-    const renderPassDescriptor = framebuffer.renderPassDescriptor;
+    const renderPassDescriptor = this.getRenderPassDescriptor(framebuffer);
     this.handle = this.props.handle || device.commandEncoder.beginRenderPass(renderPassDescriptor);
     this.handle.label = this.props.id;
   }
@@ -1017,6 +1019,30 @@ var WebGPURenderPass = class extends import_api10.RenderPass {
   // beginPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
   // endPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
   // executeBundles(bundles: Iterable<GPURenderBundle>): void;
+  // INTERNAL
+  /** 
+   * Partial render pass descriptor. Used by WebGPURenderPass.
+   * @returns attachments fields of a renderpass descriptor. 
+   */
+  getRenderPassDescriptor(framebuffer) {
+    const renderPassDescriptor = {
+      colorAttachments: []
+    };
+    renderPassDescriptor.colorAttachments = framebuffer.colorAttachments.map((colorAttachment) => ({
+      // clear values
+      loadOp: "clear",
+      colorClearValue: this.props.clearColor || [0, 0, 0, 0],
+      storeOp: this.props.discard ? "discard" : "store",
+      // ...colorAttachment,
+      view: colorAttachment.handle.createView()
+    }));
+    if (framebuffer.depthStencilAttachment) {
+      renderPassDescriptor.depthStencilAttachment = __spreadProps(__spreadValues({}, this.props), {
+        view: framebuffer.depthStencilAttachment.handle.createView()
+      });
+    }
+    return renderPassDescriptor;
+  }
 };
 
 // src/adapter/resources/webgpu-compute-pass.ts
@@ -1086,88 +1112,8 @@ var import_api12 = require("@luma.gl/api");
 var WebGPUFramebuffer = class extends import_api12.Framebuffer {
   constructor(device, props) {
     super(device, props);
-    this.colorAttachments = [];
-    this.depthStencilAttachment = null;
-    /** Partial render pass descriptor. Used by WebGPURenderPass */
-    this.renderPassDescriptor = {
-      colorAttachments: []
-    };
     this.device = device;
-    if (props.depthStencilAttachment) {
-      this.depthStencilAttachment = this.createDepthStencilTexture(props);
-    }
-    if (props.colorAttachments) {
-      this.colorAttachments = props.colorAttachments.map((colorAttachment) => this.createColorTexture(this.props, colorAttachment));
-    }
-    if (this.depthStencilAttachment) {
-      this.renderPassDescriptor.depthStencilAttachment = {
-        view: this.depthStencilAttachment.handle.createView(),
-        // Add default clear values
-        depthClearValue: 1,
-        depthStoreOp: "store",
-        stencilClearValue: 0,
-        stencilStoreOp: "store"
-      };
-    }
-    if (this.colorAttachments.length > 0) {
-      this.renderPassDescriptor.colorAttachments = this.colorAttachments.map((colorAttachment) => ({
-        view: colorAttachment.handle.createView(),
-        loadOp: "clear",
-        loadValue: [0, 0, 0, 0],
-        storeOp: "store"
-      }));
-    }
-  }
-  /** Create depth stencil texture */
-  createDepthStencilTexture(props) {
-    if (props.depthStencilAttachment instanceof WebGPUTexture) {
-      return props.depthStencilAttachment;
-    }
-    if (typeof props.depthStencilAttachment === "string") {
-      return this.device._createTexture({
-        id: "depth-stencil-attachment",
-        format: props.depthStencilAttachment,
-        width: props.width,
-        height: props.height,
-        usage: import_api12.Texture.RENDER_ATTACHMENT
-      });
-    }
-    throw new Error("type");
-  }
-  createColorTexture(props, texture) {
-    if (texture instanceof WebGPUTexture) {
-      return texture;
-    }
-    if (typeof texture === "string") {
-      return this.device._createTexture({
-        id: "color-attachment",
-        format: texture,
-        width: props.width,
-        height: props.height,
-        usage: import_api12.Texture.RENDER_ATTACHMENT
-      });
-    }
-    throw new Error("type");
-  }
-  /**
-   * Create new textures with correct size for all attachments.
-   * @note destroys existing textures.
-   */
-  _resizeAttachments(width, height) {
-    for (let i = 0; i < this.colorAttachments.length; ++i) {
-      if (this.colorAttachments[i]) {
-        const resizedTexture = this.device._createTexture(__spreadProps(__spreadValues({}, this.colorAttachments[i].props), { width, height }));
-        this.colorAttachments[i].destroy();
-        this.colorAttachments[i] = resizedTexture;
-        this.renderPassDescriptor.colorAttachments[i].view = resizedTexture.handle.createView();
-      }
-    }
-    if (this.depthStencilAttachment) {
-      const resizedTexture = this.device._createTexture(__spreadProps(__spreadValues({}, this.depthStencilAttachment.props), { width, height }));
-      this.depthStencilAttachment.destroy();
-      this.depthStencilAttachment = resizedTexture;
-      this.renderPassDescriptor.depthStencilAttachment.view = resizedTexture.handle.createView();
-    }
+    this.autoCreateAttachmentTextures();
   }
 };
 
@@ -1297,7 +1243,8 @@ var _WebGPUDevice = class extends import_api14.Device {
       if (!adapter) {
         throw new Error("Failed to request WebGPU adapter");
       }
-      import_api14.log.probe(1, "Adapter available")();
+      const adapterInfo = yield adapter.requestAdapterInfo();
+      import_api14.log.probe(1, "Adapter available", adapterInfo)();
       const gpuDevice = yield adapter.requestDevice({
         requiredFeatures: adapter.features
         // TODO ensure we obtain best limits
@@ -1342,8 +1289,9 @@ var _WebGPUDevice = class extends import_api14.Device {
   get isLost() {
     return this._isLost;
   }
-  _createBuffer(props) {
-    return new WebGPUBuffer(this, props);
+  createBuffer(props) {
+    const newProps = this._getBufferProps(props);
+    return new WebGPUBuffer(this, newProps);
   }
   _createTexture(props) {
     return new WebGPUTexture(this, props);
@@ -1379,6 +1327,9 @@ var _WebGPUDevice = class extends import_api14.Device {
     this.commandEncoder = this.commandEncoder || this.handle.createCommandEncoder();
     return new WebGPUComputePass(this, props);
   }
+  // createCommandEncoder(props: CommandEncoderProps): WebGPUCommandEncoder {
+  //   return new WebGPUCommandEncoder(this, props);
+  // }
   createCanvasContext(props) {
     return new WebGPUCanvasContext(this, this.adapter, props);
   }
@@ -1437,6 +1388,49 @@ var _WebGPUDevice = class extends import_api14.Device {
     features.add("glsl-texture-lod");
     return features;
   }
+  copyExternalImageToTexture(options) {
+    var _a;
+    const {
+      source,
+      sourceX = 0,
+      sourceY = 0,
+      texture,
+      mipLevel = 0,
+      aspect = "all",
+      colorSpace = "display-p3",
+      premultipliedAlpha = false,
+      // destinationX,
+      // destinationY,
+      // desitnationZ,
+      width = texture.width,
+      height = texture.height,
+      depth = 1
+    } = options;
+    const webGpuTexture = texture;
+    (_a = this.handle) == null ? void 0 : _a.queue.copyExternalImageToTexture(
+      // source: GPUImageCopyExternalImage
+      {
+        source,
+        origin: [sourceX, sourceY]
+      },
+      // destination: GPUImageCopyTextureTagged
+      {
+        texture: webGpuTexture.handle,
+        origin: [0, 0, 0],
+        // [x, y, z],
+        mipLevel,
+        aspect,
+        colorSpace,
+        premultipliedAlpha
+      },
+      // copySize: GPUExtent3D
+      [
+        width,
+        height,
+        depth
+      ]
+    );
+  }
 };
 var WebGPUDevice = _WebGPUDevice;
 WebGPUDevice.type = "webgpu";