@luma.gl/webgpu 9.0.0-alpha.4 → 9.0.0-alpha.40

package/dist/adapter/resources/webgpu-render-pass.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":["RenderPass","cast","WebGPURenderPass","constructor","device","props","framebuffer","canvasContext","getCurrentFramebuffer","renderPassDescriptor","handle","commandEncoder","beginRenderPass","label","id","destroy","endPass","setPipeline","pipeline","setBindings","bindings","setBindGroup","_getBindGroup","setIndexBuffer","buffer","indexFormat","offset","size","setVertexBuffer","slot","draw","options","indexCount","drawIndexed","instanceCount","firstIndex","baseVertex","firstInstance","vertexCount","drawIndirect","setParameters","parameters","blendConstant","stencilReference","scissorRect","viewport","setBlendConstant","setStencilReference","setScissorRect","setViewport","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel"],"mappings":"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","sourcesContent":["import type {RenderPassProps, RenderPassParameters, Binding} from '@luma.gl/api';\nimport {Buffer, RenderPass, RenderPipeline, cast, log} from '@luma.gl/api';\nimport WebGPUDevice from '../webgpu-device';\nimport WebGPUBuffer from './webgpu-buffer';\n// import WebGPUCommandEncoder from './webgpu-command-encoder';\nimport WebGPURenderPipeline from './webgpu-render-pipeline';\n\nexport default class WebGPURenderPass extends RenderPass {\n  readonly device: WebGPUDevice;\n  readonly handle: GPURenderPassEncoder;\n\n  /** Active pipeline */\n  pipeline: WebGPURenderPipeline | null = null;\n\n  constructor(device: WebGPUDevice, props: RenderPassProps = {}) {\n    super(device, props);\n    this.device = device;\n    const framebuffer = props.framebuffer || device.canvasContext.getCurrentFramebuffer();\n    // @ts-expect-error\n    const renderPassDescriptor = framebuffer.renderPassDescriptor;\n    this.handle = this.props.handle || device.commandEncoder.beginRenderPass(renderPassDescriptor);\n    this.handle.label = this.props.id;\n  }\n\n  destroy() {}\n\n  endPass(): void {\n    this.handle.endPass();\n  }\n\n  setPipeline(pipeline: RenderPipeline): void {\n    this.pipeline = cast<WebGPURenderPipeline>(pipeline);\n    this.handle.setPipeline(this.pipeline.handle);\n  }\n\n  /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */\n  setBindings(bindings: Record<string, Binding>): void {\n    this.pipeline.setBindings(bindings);\n    this.handle.setBindGroup(0, this.pipeline._getBindGroup());\n  }\n\n  setIndexBuffer(\n    buffer: Buffer,\n    indexFormat: GPUIndexFormat,\n    offset: number = 0,\n    size?: number\n  ): void {\n    this.handle.setIndexBuffer(cast<WebGPUBuffer>(buffer).handle, indexFormat, offset, size);\n  }\n\n  setVertexBuffer(slot: number, buffer: Buffer, offset: number = 0): void {\n    this.handle.setVertexBuffer(slot, cast<WebGPUBuffer>(buffer).handle, offset);\n  }\n\n  draw(options: {\n    vertexCount?: number;\n    indexCount?: number;\n    instanceCount?: number;\n    firstVertex?: number;\n    firstIndex?: number;\n    firstInstance?: number;\n    baseVertex?: number;\n  }): void {\n    if (options.indexCount) {\n      this.handle.drawIndexed(\n        options.indexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.baseVertex,\n        options.firstInstance\n      );\n    } else {\n      this.handle.draw(\n        options.vertexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.firstInstance\n      );\n    }\n  }\n\n  drawIndirect(): void {\n    // drawIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;\n    // drawIndexedIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;\n  }\n\n  setParameters(parameters: RenderPassParameters): void {\n    const {blendConstant, stencilReference, scissorRect, viewport} = parameters;\n    if (blendConstant) {\n      this.handle.setBlendConstant(blendConstant);\n    }\n    if (stencilReference) {\n      this.handle.setStencilReference(stencilReference);\n    }\n    if (scissorRect) {\n      this.handle.setScissorRect(scissorRect[0], scissorRect[1], scissorRect[2], scissorRect[3]);\n    }\n    // TODO - explain how 3 dimensions vs 2 in WebGL works.\n    if (viewport) {\n      this.handle.setViewport(\n        viewport[0],\n        viewport[1],\n        viewport[2],\n        viewport[3],\n        viewport[4],\n        viewport[5]\n      );\n    }\n  }\n\n  pushDebugGroup(groupLabel: string): void {\n    this.handle.pushDebugGroup(groupLabel);\n  }\n  popDebugGroup(): void {\n    this.handle.popDebugGroup();\n  }\n  insertDebugMarker(markerLabel: string): void {\n    this.handle.insertDebugMarker(markerLabel);\n  }\n\n  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;\n  // beginOcclusionQuery(queryIndex: number): void;\n  // endOcclusionQuery(): void;\n  // beginPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;\n  // endPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;\n\n  // executeBundles(bundles: Iterable<GPURenderBundle>): void;\n}\n"],"file":"webgpu-render-pass.js"}
+{"version":3,"file":"webgpu-render-pass.js","names":["RenderPass","cast","log","WebGPURenderPass","constructor","device","props","arguments","length","undefined","handle","pipeline","framebuffer","canvasContext","getCurrentFramebuffer","renderPassDescriptor","getRenderPassDescriptor","groupCollapsed","id","probe","JSON","stringify","groupEnd","commandEncoder","beginRenderPass","label","destroy","end","setPipeline","setBindings","bindings","_this$pipeline","_this$pipeline2","bindGroup","_getBindGroup","setBindGroup","setIndexBuffer","buffer","indexFormat","offset","size","setVertexBuffer","slot","draw","options","indexCount","drawIndexed","instanceCount","firstIndex","baseVertex","firstInstance","vertexCount","drawIndirect","setParameters","parameters","blendConstant","stencilReference","scissorRect","viewport","setBlendConstant","setStencilReference","setScissorRect","setViewport","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel","colorAttachments","map","colorAttachment","loadOp","clearColor","colorClearValue","storeOp","discard","view","createView","depthStencilAttachment","depthReadOnly","depthClearValue","clearDepth","hasDepthAspect","depthLoadOp","depthStoreOp","hasStencilAspect","stencilLoadOp","clearStencil","stencilStoreOp"],"sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"sourcesContent":["import type {RenderPassProps, RenderPassParameters, Binding, Framebuffer} from '@luma.gl/core';\nimport {Buffer, RenderPass, RenderPipeline, cast, log} from '@luma.gl/core';\nimport {WebGPUDevice} from '../webgpu-device';\nimport {WebGPUBuffer} from './webgpu-buffer';\nimport {WebGPUTexture} from './webgpu-texture';\n// import {WebGPUCommandEncoder} from './webgpu-command-encoder';\nimport {WebGPURenderPipeline} from './webgpu-render-pipeline';\n\nexport class WebGPURenderPass extends RenderPass {\n  readonly device: WebGPUDevice;\n  readonly handle: GPURenderPassEncoder;\n\n  /** Active pipeline */\n  pipeline: WebGPURenderPipeline | null = null;\n\n  constructor(device: WebGPUDevice, props: RenderPassProps = {}) {\n    super(device, props);\n    this.device = device;\n    const framebuffer = props.framebuffer || device.canvasContext.getCurrentFramebuffer() ;\n    const renderPassDescriptor = this.getRenderPassDescriptor(framebuffer);\n    log.groupCollapsed(1, `new WebGPURenderPass(${this.id})`)();\n    log.probe(1, JSON.stringify(renderPassDescriptor, null, 2))();\n    log.groupEnd(1)();\n    this.handle = this.props.handle || device.commandEncoder.beginRenderPass(renderPassDescriptor);\n    this.handle.label = this.props.id;\n  }\n\n  override destroy(): void {}\n\n  end(): void {\n    this.handle.end();\n  }\n\n  setPipeline(pipeline: RenderPipeline): void {\n    this.pipeline = cast<WebGPURenderPipeline>(pipeline);\n    this.handle.setPipeline(this.pipeline.handle);\n  }\n\n  /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */\n  setBindings(bindings: Record<string, Binding>): void {\n    this.pipeline?.setBindings(bindings);\n    const bindGroup = this.pipeline?._getBindGroup();\n    if (bindGroup) {\n      this.handle.setBindGroup(0, bindGroup);\n    }\n  }\n\n  setIndexBuffer(\n    buffer: Buffer,\n    indexFormat: GPUIndexFormat,\n    offset: number = 0,\n    size?: number\n  ): void {\n    this.handle.setIndexBuffer(cast<WebGPUBuffer>(buffer).handle, indexFormat, offset, size);\n  }\n\n  setVertexBuffer(slot: number, buffer: Buffer, offset: number = 0): void {\n    this.handle.setVertexBuffer(slot, cast<WebGPUBuffer>(buffer).handle, offset);\n  }\n\n  draw(options: {\n    vertexCount?: number;\n    indexCount?: number;\n    instanceCount?: number;\n    firstVertex?: number;\n    firstIndex?: number;\n    firstInstance?: number;\n    baseVertex?: number;\n  }): void {\n    if (options.indexCount) {\n      this.handle.drawIndexed(\n        options.indexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.baseVertex,\n        options.firstInstance\n      );\n    } else {\n      this.handle.draw(\n        options.vertexCount || 0,\n        options.instanceCount || 1,\n        options.firstIndex,\n        options.firstInstance\n      );\n    }\n  }\n\n  drawIndirect(): void {\n    // drawIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;\n    // drawIndexedIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;\n  }\n\n  setParameters(parameters: RenderPassParameters): void {\n    const {blendConstant, stencilReference, scissorRect, viewport} = parameters;\n    if (blendConstant) {\n      this.handle.setBlendConstant(blendConstant);\n    }\n    if (stencilReference) {\n      this.handle.setStencilReference(stencilReference);\n    }\n    if (scissorRect) {\n      this.handle.setScissorRect(scissorRect[0], scissorRect[1], scissorRect[2], scissorRect[3]);\n    }\n    // TODO - explain how 3 dimensions vs 2 in WebGL works.\n    if (viewport) {\n      this.handle.setViewport(\n        viewport[0],\n        viewport[1],\n        viewport[2],\n        viewport[3],\n        viewport[4],\n        viewport[5]\n      );\n    }\n  }\n\n  pushDebugGroup(groupLabel: string): void {\n    this.handle.pushDebugGroup(groupLabel);\n  }\n  popDebugGroup(): void {\n    this.handle.popDebugGroup();\n  }\n  insertDebugMarker(markerLabel: string): void {\n    this.handle.insertDebugMarker(markerLabel);\n  }\n\n  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;\n  // beginOcclusionQuery(queryIndex: number): void;\n  // endOcclusionQuery(): void;\n  // beginPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;\n  // endPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;\n\n  // executeBundles(bundles: Iterable<GPURenderBundle>): void;\n\n  // INTERNAL\n\n  /** \n   * Partial render pass descriptor. Used by WebGPURenderPass.\n   * @returns attachments fields of a renderpass descriptor. \n   */\n  protected getRenderPassDescriptor(framebuffer: Framebuffer): GPURenderPassDescriptor {\n    const renderPassDescriptor: GPURenderPassDescriptor = {\n      colorAttachments: []\n    };\n\n    renderPassDescriptor.colorAttachments = framebuffer.colorAttachments.map(colorAttachment => ({\n      // clear values\n      loadOp: this.props.clearColor !== false ? 'clear' : 'load',\n      colorClearValue: this.props.clearColor || [0, 0, 0, 0],\n      storeOp: this.props.discard? 'discard': 'store',\n      // ...colorAttachment,\n      view: (colorAttachment as WebGPUTexture).handle.createView()\n    }));\n\n    if (framebuffer.depthStencilAttachment) {\n      renderPassDescriptor.depthStencilAttachment = {\n        view: (framebuffer.depthStencilAttachment as WebGPUTexture).handle.createView()\n      };\n      const {depthStencilAttachment} = renderPassDescriptor;\n\n      // DEPTH\n      if (this.props.depthReadOnly) {\n        depthStencilAttachment.depthReadOnly = true;\n      }\n      depthStencilAttachment.depthClearValue = this.props.clearDepth || 0;\n\n      // WebGPU only wants us to set these parameters if the texture format actually has a depth aspect\n      const hasDepthAspect = true;\n      if (hasDepthAspect) {\n        depthStencilAttachment.depthLoadOp = this.props.clearDepth !== false ? 'clear' : 'load';\n        depthStencilAttachment.depthStoreOp = 'store'; // TODO - support 'discard'?\n      }\n\n      // WebGPU only wants us to set these parameters if the texture format actually has a stencil aspect\n      const hasStencilAspect = false;\n      if (hasStencilAspect) {\n        depthStencilAttachment.stencilLoadOp = this.props.clearStencil !== false ? 'clear' : 'load';\n        depthStencilAttachment.stencilStoreOp = 'store'; // TODO - support 'discard'?\n      }\n    }\n\n    return renderPassDescriptor;\n  }\n}\n"],"mappings":"AACA,SAAgBA,UAAU,EAAkBC,IAAI,EAAEC,GAAG,QAAO,eAAe;AAO3E,OAAO,MAAMC,gBAAgB,SAASH,UAAU,CAAC;EAO/CI,WAAWA,CAACC,MAAoB,EAA+B;IAAA,IAA7BC,KAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;IAC3D,KAAK,CAACF,MAAM,EAAEC,KAAK,CAAC;IAAC,KAPdD,MAAM;IAAA,KACNK,MAAM;IAAA,KAGfC,QAAQ,GAAgC,IAAI;IAI1C,IAAI,CAACN,MAAM,GAAGA,MAAM;IACpB,MAAMO,WAAW,GAAGN,KAAK,CAACM,WAAW,IAAIP,MAAM,CAACQ,aAAa,CAACC,qBAAqB,CAAC,CAAC;IACrF,MAAMC,oBAAoB,GAAG,IAAI,CAACC,uBAAuB,CAACJ,WAAW,CAAC;IACtEV,GAAG,CAACe,cAAc,CAAC,CAAC,EAAG,wBAAuB,IAAI,CAACC,EAAG,GAAE,CAAC,CAAC,CAAC;IAC3DhB,GAAG,CAACiB,KAAK,CAAC,CAAC,EAAEC,IAAI,CAACC,SAAS,CAACN,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7Db,GAAG,CAACoB,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACjB,IAAI,CAACZ,MAAM,GAAG,IAAI,CAACJ,KAAK,CAACI,MAAM,IAAIL,MAAM,CAACkB,cAAc,CAACC,eAAe,CAACT,oBAAoB,CAAC;IAC9F,IAAI,CAACL,MAAM,CAACe,KAAK,GAAG,IAAI,CAACnB,KAAK,CAACY,EAAE;EACnC;EAESQ,OAAOA,CAAA,EAAS,CAAC;EAE1BC,GAAGA,CAAA,EAAS;IACV,IAAI,CAACjB,MAAM,CAACiB,GAAG,CAAC,CAAC;EACnB;EAEAC,WAAWA,CAACjB,QAAwB,EAAQ;IAC1C,IAAI,CAACA,QAAQ,GAAGV,IAAI,CAAuBU,QAAQ,CAAC;IACpD,IAAI,CAACD,MAAM,CAACkB,WAAW,CAAC,IAAI,CAACjB,QAAQ,CAACD,MAAM,CAAC;EAC/C;EAGAmB,WAAWA,CAACC,QAAiC,EAAQ;IAAA,IAAAC,cAAA,EAAAC,eAAA;IACnD,CAAAD,cAAA,OAAI,CAACpB,QAAQ,cAAAoB,cAAA,uBAAbA,cAAA,CAAeF,WAAW,CAACC,QAAQ,CAAC;IACpC,MAAMG,SAAS,IAAAD,eAAA,GAAG,IAAI,CAACrB,QAAQ,cAAAqB,eAAA,uBAAbA,eAAA,CAAeE,aAAa,CAAC,CAAC;IAChD,IAAID,SAAS,EAAE;MACb,IAAI,CAACvB,MAAM,CAACyB,YAAY,CAAC,CAAC,EAAEF,SAAS,CAAC;IACxC;EACF;EAEAG,cAAcA,CACZC,MAAc,EACdC,WAA2B,EAGrB;IAAA,IAFNC,MAAc,GAAAhC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;IAAA,IAClBiC,IAAa,GAAAjC,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;IAEb,IAAI,CAACC,MAAM,CAAC0B,cAAc,CAACnC,IAAI,CAAeoC,MAAM,CAAC,CAAC3B,MAAM,EAAE4B,WAAW,EAAEC,MAAM,EAAEC,IAAI,CAAC;EAC1F;EAEAC,eAAeA,CAACC,IAAY,EAAEL,MAAc,EAA4B;IAAA,IAA1BE,MAAc,GAAAhC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;IAC9D,IAAI,CAACG,MAAM,CAAC+B,eAAe,CAACC,IAAI,EAAEzC,IAAI,CAAeoC,MAAM,CAAC,CAAC3B,MAAM,EAAE6B,MAAM,CAAC;EAC9E;EAEAI,IAAIA,CAACC,OAQJ,EAAQ;IACP,IAAIA,OAAO,CAACC,UAAU,EAAE;MACtB,IAAI,CAACnC,MAAM,CAACoC,WAAW,CACrBF,OAAO,CAACC,UAAU,EAClBD,OAAO,CAACG,aAAa,EACrBH,OAAO,CAACI,UAAU,EAClBJ,OAAO,CAACK,UAAU,EAClBL,OAAO,CAACM,aACV,CAAC;IACH,CAAC,MAAM;MACL,IAAI,CAACxC,MAAM,CAACiC,IAAI,CACdC,OAAO,CAACO,WAAW,IAAI,CAAC,EACxBP,OAAO,CAACG,aAAa,IAAI,CAAC,EAC1BH,OAAO,CAACI,UAAU,EAClBJ,OAAO,CAACM,aACV,CAAC;IACH;EACF;EAEAE,YAAYA,CAAA,EAAS,CAGrB;EAEAC,aAAaA,CAACC,UAAgC,EAAQ;IACpD,MAAM;MAACC,aAAa;MAAEC,gBAAgB;MAAEC,WAAW;MAAEC;IAAQ,CAAC,GAAGJ,UAAU;IAC3E,IAAIC,aAAa,EAAE;MACjB,IAAI,CAAC7C,MAAM,CAACiD,gBAAgB,CAACJ,aAAa,CAAC;IAC7C;IACA,IAAIC,gBAAgB,EAAE;MACpB,IAAI,CAAC9C,MAAM,CAACkD,mBAAmB,CAACJ,gBAAgB,CAAC;IACnD;IACA,IAAIC,WAAW,EAAE;MACf,IAAI,CAAC/C,MAAM,CAACmD,cAAc,CAACJ,WAAW,CAAC,CAAC,CAAC,EAAEA,WAAW,CAAC,CAAC,CAAC,EAAEA,WAAW,CAAC,CAAC,CAAC,EAAEA,WAAW,CAAC,CAAC,CAAC,CAAC;IAC5F;IAEA,IAAIC,QAAQ,EAAE;MACZ,IAAI,CAAChD,MAAM,CAACoD,WAAW,CACrBJ,QAAQ,CAAC,CAAC,CAAC,EACXA,QAAQ,CAAC,CAAC,CAAC,EACXA,QAAQ,CAAC,CAAC,CAAC,EACXA,QAAQ,CAAC,CAAC,CAAC,EACXA,QAAQ,CAAC,CAAC,CAAC,EACXA,QAAQ,CAAC,CAAC,CACZ,CAAC;IACH;EACF;EAEAK,cAAcA,CAACC,UAAkB,EAAQ;IACvC,IAAI,CAACtD,MAAM,CAACqD,cAAc,CAACC,UAAU,CAAC;EACxC;EACAC,aAAaA,CAAA,EAAS;IACpB,IAAI,CAACvD,MAAM,CAACuD,aAAa,CAAC,CAAC;EAC7B;EACAC,iBAAiBA,CAACC,WAAmB,EAAQ;IAC3C,IAAI,CAACzD,MAAM,CAACwD,iBAAiB,CAACC,WAAW,CAAC;EAC5C;EAgBUnD,uBAAuBA,CAACJ,WAAwB,EAA2B;IACnF,MAAMG,oBAA6C,GAAG;MACpDqD,gBAAgB,EAAE;IACpB,CAAC;IAEDrD,oBAAoB,CAACqD,gBAAgB,GAAGxD,WAAW,CAACwD,gBAAgB,CAACC,GAAG,CAACC,eAAe,KAAK;MAE3FC,MAAM,EAAE,IAAI,CAACjE,KAAK,CAACkE,UAAU,KAAK,KAAK,GAAG,OAAO,GAAG,MAAM;MAC1DC,eAAe,EAAE,IAAI,CAACnE,KAAK,CAACkE,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;MACtDE,OAAO,EAAE,IAAI,CAACpE,KAAK,CAACqE,OAAO,GAAE,SAAS,GAAE,OAAO;MAE/CC,IAAI,EAAGN,eAAe,CAAmB5D,MAAM,CAACmE,UAAU,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,IAAIjE,WAAW,CAACkE,sBAAsB,EAAE;MACtC/D,oBAAoB,CAAC+D,sBAAsB,GAAG;QAC5CF,IAAI,EAAGhE,WAAW,CAACkE,sBAAsB,CAAmBpE,MAAM,CAACmE,UAAU,CAAC;MAChF,CAAC;MACD,MAAM;QAACC;MAAsB,CAAC,GAAG/D,oBAAoB;MAGrD,IAAI,IAAI,CAACT,KAAK,CAACyE,aAAa,EAAE;QAC5BD,sBAAsB,CAACC,aAAa,GAAG,IAAI;MAC7C;MACAD,sBAAsB,CAACE,eAAe,GAAG,IAAI,CAAC1E,KAAK,CAAC2E,UAAU,IAAI,CAAC;MAGnE,MAAMC,cAAc,GAAG,IAAI;MAC3B,IAAIA,cAAc,EAAE;QAClBJ,sBAAsB,CAACK,WAAW,GAAG,IAAI,CAAC7E,KAAK,CAAC2E,UAAU,KAAK,KAAK,GAAG,OAAO,GAAG,MAAM;QACvFH,sBAAsB,CAACM,YAAY,GAAG,OAAO;MAC/C;MAGA,MAAMC,gBAAgB,GAAG,KAAK;MAC9B,IAAIA,gBAAgB,EAAE;QACpBP,sBAAsB,CAACQ,aAAa,GAAG,IAAI,CAAChF,KAAK,CAACiF,YAAY,KAAK,KAAK,GAAG,OAAO,GAAG,MAAM;QAC3FT,sBAAsB,CAACU,cAAc,GAAG,OAAO;MACjD;IACF;IAEA,OAAOzE,oBAAoB;EAC7B;AACF"}

package/dist/adapter/resources/webgpu-render-pipeline.d.ts

@@ -1,12 +1,15 @@
-/// <reference types="@webgpu/types" />
-import type { Binding, RenderPass } from '@luma.gl/api';
-import { Buffer, RenderPipeline, RenderPipelineProps } from '@luma.gl/api';
-import type WebGPUDevice from '../webgpu-device';
-import type WebGPURenderPass from './webgpu-render-pass';
+/// <reference types="dist" />
+import type { TypedArray, Binding, UniformValue, RenderPass } from '@luma.gl/core';
+import { Buffer, RenderPipeline, RenderPipelineProps } from '@luma.gl/core';
+import type { WebGPUDevice } from '../webgpu-device';
+import type { WebGPUShader } from './webgpu-shader';
+import type { WebGPURenderPass } from './webgpu-render-pass';
 /** Creates a new render pipeline when parameters change */
-export default class WebGPURenderPipeline extends RenderPipeline {
+export declare class WebGPURenderPipeline extends RenderPipeline {
     device: WebGPUDevice;
     handle: GPURenderPipeline;
+    vs: WebGPUShader;
+    fs: WebGPUShader | null;
     private _bufferSlots;
     private _buffers;
     private _indexBuffer;
@@ -14,17 +17,18 @@ export default class WebGPURenderPipeline extends RenderPipeline {
     private _bindGroupLayout;
     private _bindGroup;
     constructor(device: WebGPUDevice, props: RenderPipelineProps);
-    protected createHandle(): GPURenderPipeline;
     destroy(): void;
     setIndexBuffer(indexBuffer: Buffer): void;
     setAttributes(attributes: Record<string, Buffer>): void;
-    /** Set the bindings */
+    setConstantAttributes(attributes: Record<string, TypedArray>): void;
     setBindings(bindings: Record<string, Binding>): void;
-    setUniforms(uniforms: Record<string, any>): void;
+    setUniforms(uniforms: Record<string, UniformValue>): void;
     _getBuffers(): Buffer[];
     /** Return a bind group created by setBindings */
     _getBindGroup(): GPUBindGroup;
-    /** Populate the complex WebGPU GPURenderPipelineDescriptor */
+    /**
+     * Populate the complex WebGPU GPURenderPipelineDescriptor
+     */
     protected _getRenderPipelineDescriptor(): GPURenderPipelineDescriptor;
     draw(options: {
         renderPass?: RenderPass;

package/dist/adapter/resources/webgpu-render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACtD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAA2B,MAAM,cAAc,CAAC;AASnG,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAGjD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAC;AAIzD,2DAA2D;AAC3D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,cAAc;IAC9D,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,YAAY,CAAe;IAInC,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAAsB;gBAE5B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAW5D,SAAS,CAAC,YAAY,IAAI,iBAAiB;IAS3C,OAAO;IAIP,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAmBvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAapD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,WAAW;IAIX,iDAAiD;IACjD,aAAa;IAKb,8DAA8D;IAC9D,SAAS,CAAC,4BAA4B;IAqCtC,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAkCR,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;CAwCxD"}
+{"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAC,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAA2B,MAAM,eAAe,CAAC;AASpG,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAI3D,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,iBAAiB,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAE/B,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,YAAY,CAA6B;IAIjD,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAoBnD,OAAO,IAAI,IAAI;IAIxB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAmBvD,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAInE,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAkBpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;IAMzD,WAAW;IAIX,iDAAiD;IACjD,aAAa;IAKb;;OAEG;IACH,SAAS,CAAC,4BAA4B;IA+CtC,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAkCR,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;CAwCxD"}

package/dist/adapter/resources/webgpu-render-pipeline.js

@@ -1,148 +1,131 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { RenderPipeline, cast, log, isObjectEmpty } from '@luma.gl/api';
-import { applyParametersToRenderPipelineDescriptor } from '../helpers/webgpu-parameters';
-import { getWebGPUTextureFormat } from '../helpers/convert-texture-format';
-import { getBindGroup } from '../helpers/get-bind-group';
-import { getVertexBufferLayout, getBufferSlots } from '../helpers/get-vertex-buffer-layout';
-export default class WebGPURenderPipeline extends RenderPipeline {
+import { RenderPipeline, cast, log, isObjectEmpty } from '@luma.gl/core';
+import { applyParametersToRenderPipelineDescriptor } from "../helpers/webgpu-parameters.js";
+import { getWebGPUTextureFormat } from "../helpers/convert-texture-format.js";
+import { getBindGroup } from "../helpers/get-bind-group.js";
+import { getVertexBufferLayout, getBufferSlots } from "../helpers/get-vertex-buffer-layout.js";
+export class WebGPURenderPipeline extends RenderPipeline {
   constructor(device, props) {
     super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    _defineProperty(this, "_bufferSlots", void 0);
-
-    _defineProperty(this, "_buffers", void 0);
-
-    _defineProperty(this, "_indexBuffer", void 0);
-
-    _defineProperty(this, "_bindGroupLayout", void 0);
-
-    _defineProperty(this, "_bindGroup", null);
-
+    this.device = void 0;
+    this.handle = void 0;
+    this.vs = void 0;
+    this.fs = null;
+    this._bufferSlots = void 0;
+    this._buffers = void 0;
+    this._indexBuffer = null;
+    this._bindGroupLayout = null;
+    this._bindGroup = null;
     this.device = device;
-    this.handle = this.props.handle || this.createHandle();
+    this.handle = this.props.handle;
+    if (!this.handle) {
+      const descriptor = this._getRenderPipelineDescriptor();
+      log.groupCollapsed(1, `new WebGPURenderPipeline(${this.id})`)();
+      log.probe(1, JSON.stringify(descriptor, null, 2))();
+      log.groupEnd(1)();
+      this.handle = this.device.handle.createRenderPipeline(descriptor);
+    }
     this.handle.label = this.props.id;
-    this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);
+    this.vs = cast(props.vs);
+    this.fs = cast(props.fs);
+    this._bufferSlots = getBufferSlots(this.props.shaderLayout, this.props.bufferLayout);
     this._buffers = new Array(Object.keys(this._bufferSlots).length).fill(null);
-    this._bindGroupLayout = this.handle.getBindGroupLayout(0);
-  }
-
-  createHandle() {
-    const descriptor = this._getRenderPipelineDescriptor();
-
-    const renderPipeline = this.device.handle.createRenderPipeline(descriptor);
-    log.groupCollapsed(1, "new WebGPRenderPipeline(".concat(this.id, ")"))();
-    log.log(1, JSON.stringify(descriptor, null, 2))();
-    log.groupEnd(1)();
-    return renderPipeline;
   }
-
   destroy() {}
-
   setIndexBuffer(indexBuffer) {
     this._indexBuffer = cast(indexBuffer);
   }
-
   setAttributes(attributes) {
     for (const [name, buffer] of Object.entries(attributes)) {
       const bufferIndex = this._bufferSlots[name];
-
       if (bufferIndex >= 0) {
         this._buffers[bufferIndex] = buffer;
       } else {
-        throw new Error("Setting attribute '".concat(name, "' not listed in shader layout for program ").concat(this.id));
+        throw new Error(`Setting attribute '${name}' not listed in shader layout for program ${this.id}`);
       }
     }
   }
-
+  setConstantAttributes(attributes) {
+    throw new Error('not implemented');
+  }
   setBindings(bindings) {
     if (!isObjectEmpty(this.props.bindings)) {
       Object.assign(this.props.bindings, bindings);
-      this._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.layout, this.props.bindings);
+      this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);
+      this._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this.props.bindings);
     }
   }
-
   setUniforms(uniforms) {
     if (!isObjectEmpty(uniforms)) {
       throw new Error('WebGPU does not support uniforms');
     }
   }
-
   _getBuffers() {
     return this._buffers;
   }
-
   _getBindGroup() {
     return this._bindGroup;
   }
-
   _getRenderPipelineDescriptor() {
     const vertex = {
       module: cast(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)
     };
     let fragment;
-
     if (this.props.fs) {
+      var _this$device;
       fragment = {
         module: cast(this.props.fs).handle,
         entryPoint: this.props.fsEntryPoint || 'main',
         targets: [{
-          format: getWebGPUTextureFormat(this.device.canvasContext.format)
+          format: getWebGPUTextureFormat((_this$device = this.device) === null || _this$device === void 0 || (_this$device = _this$device.canvasContext) === null || _this$device === void 0 ? void 0 : _this$device.format)
         }]
       };
     }
-
-    let descriptor = {
+    switch (this.props.topology) {
+      case 'triangle-fan-webgl':
+      case 'line-loop-webgl':
+        throw new Error(`WebGPU does not support primitive topology ${this.props.topology}`);
+      default:
+    }
+    const descriptor = {
       vertex,
       fragment,
       primitive: {
         topology: this.props.topology
-      }
+      },
+      layout: 'auto'
     };
     applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);
     return descriptor;
   }
-
   draw(options) {
     const webgpuRenderPass = cast(options.renderPass) || this.device.getDefaultRenderPass();
     webgpuRenderPass.handle.setPipeline(this.handle);
-
-    if (this._getBindGroup()) {
-      webgpuRenderPass.handle.setBindGroup(0, this._getBindGroup());
+    const bindGroup = this._getBindGroup();
+    if (bindGroup) {
+      webgpuRenderPass.handle.setBindGroup(0, bindGroup);
     }
-
     this._setAttributeBuffers(webgpuRenderPass);
-
     if (options.indexCount) {
       webgpuRenderPass.handle.drawIndexed(options.indexCount, options.instanceCount, options.firstIndex, options.baseVertex, options.firstInstance);
     } else {
-      webgpuRenderPass.handle.draw(options.vertexCount, options.instanceCount, options.firstIndex, options.firstInstance);
+      webgpuRenderPass.handle.draw(options.vertexCount || 0, options.instanceCount || 1, options.firstInstance);
     }
   }
-
   _setAttributeBuffers(webgpuRenderPass) {
     if (this._indexBuffer) {
       webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);
     }
-
     const buffers = this._getBuffers();
-
     for (let i = 0; i < buffers.length; ++i) {
       const buffer = cast(buffers[i]);
-
       if (!buffer) {
-        const attribute = this.props.layout.attributes.find(attribute => attribute.location === i);
-        throw new Error("No buffer provided for attribute '".concat((attribute === null || attribute === void 0 ? void 0 : attribute.name) || '', "' in Model '").concat(this.props.id, "'"));
+        const attribute = this.props.shaderLayout.attributes.find(attribute => attribute.location === i);
+        throw new Error(`No buffer provided for attribute '${(attribute === null || attribute === void 0 ? void 0 : attribute.name) || ''}' in Model '${this.props.id}'`);
       }
-
       webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);
     }
   }
-
 }
 //# sourceMappingURL=webgpu-render-pipeline.js.map

package/dist/adapter/resources/webgpu-render-pipeline.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":["RenderPipeline","cast","log","isObjectEmpty","applyParametersToRenderPipelineDescriptor","getWebGPUTextureFormat","getBindGroup","getVertexBufferLayout","getBufferSlots","WebGPURenderPipeline","constructor","device","props","handle","createHandle","label","id","_bufferSlots","layout","bufferMap","_buffers","Array","Object","keys","length","fill","_bindGroupLayout","getBindGroupLayout","descriptor","_getRenderPipelineDescriptor","renderPipeline","createRenderPipeline","groupCollapsed","JSON","stringify","groupEnd","destroy","setIndexBuffer","indexBuffer","_indexBuffer","setAttributes","attributes","name","buffer","entries","bufferIndex","Error","setBindings","bindings","assign","_bindGroup","setUniforms","uniforms","_getBuffers","_getBindGroup","vertex","module","vs","entryPoint","vsEntryPoint","buffers","fragment","fs","fsEntryPoint","targets","format","canvasContext","primitive","topology","parameters","draw","options","webgpuRenderPass","renderPass","getDefaultRenderPass","setPipeline","setBindGroup","_setAttributeBuffers","indexCount","drawIndexed","instanceCount","firstIndex","baseVertex","firstInstance","vertexCount","indexType","i","attribute","find","location","setVertexBuffer"],"mappings":"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","sourcesContent":["import type {Binding, RenderPass} from '@luma.gl/api';\nimport {Buffer, RenderPipeline, RenderPipelineProps, cast, log, isObjectEmpty} from '@luma.gl/api';\nimport {applyParametersToRenderPipelineDescriptor} from '../helpers/webgpu-parameters';\nimport {getWebGPUTextureFormat} from '../helpers/convert-texture-format';\nimport {getBindGroup} from '../helpers/get-bind-group';\nimport {getVertexBufferLayout, getBufferSlots} from '../helpers/get-vertex-buffer-layout';\n// import {convertAttributesVertexBufferToLayout} from '../helpers/get-vertex-buffer-layout';\n// import {mapAccessorToWebGPUFormat} from './helpers/accessor-to-format';\n// import type {BufferAccessors} from './webgpu-pipeline';\n\nimport type WebGPUDevice from '../webgpu-device';\nimport type WebGPUBuffer from './webgpu-buffer';\nimport type WebGPUShader from './webgpu-shader';\nimport type WebGPURenderPass from './webgpu-render-pass';\n\n// RENDER PIPELINE\n\n/** Creates a new render pipeline when parameters change */\nexport default class WebGPURenderPipeline extends RenderPipeline {\n  device: WebGPUDevice;\n  handle: GPURenderPipeline;\n\n  private _bufferSlots: Record<string, number>;\n  private _buffers: Buffer[];\n  private _indexBuffer: WebGPUBuffer;\n  // private _firstIndex: number;\n  // private _lastIndex: number;\n\n  /** For internal use to create BindGroups */\n  private _bindGroupLayout: GPUBindGroupLayout;\n  private _bindGroup: GPUBindGroup = null;\n\n  constructor(device: WebGPUDevice, props: RenderPipelineProps) {\n    super(device, props);\n    this.device = device;\n    this.handle = (this.props.handle as GPURenderPipeline) || this.createHandle();\n    this.handle.label = this.props.id;\n\n    this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);\n    this._buffers = new Array<Buffer>(Object.keys(this._bufferSlots).length).fill(null);\n    this._bindGroupLayout = this.handle.getBindGroupLayout(0);\n  }\n\n  protected createHandle(): GPURenderPipeline {\n    const descriptor = this._getRenderPipelineDescriptor();\n    const renderPipeline = this.device.handle.createRenderPipeline(descriptor);\n    log.groupCollapsed(1, `new WebGPRenderPipeline(${this.id})`)();\n    log.log(1, JSON.stringify(descriptor, null, 2))();\n    log.groupEnd(1)();\n    return renderPipeline;\n  }\n\n  destroy() {\n    // WebGPURenderPipeline has no destroy method.\n  }\n\n  setIndexBuffer(indexBuffer: Buffer): void {\n    this._indexBuffer = cast<WebGPUBuffer>(indexBuffer);\n  }\n\n  setAttributes(attributes: Record<string, Buffer>): void {\n    for (const [name, buffer] of Object.entries(attributes)) {\n      const bufferIndex = this._bufferSlots[name];\n      if (bufferIndex >= 0) {\n        this._buffers[bufferIndex] = buffer;\n      } else {\n        throw new Error(\n          `Setting attribute '${name}' not listed in shader layout for program ${this.id}`\n        );\n      }\n    }\n    // for (let i = 0; i < this._bufferSlots.length; ++i) {\n    //   const bufferName = this._bufferSlots[i];\n    //   if (attributes[bufferName]) {\n    //     this.handle\n    //   }\n    // }\n  }\n\n  /** Set the bindings */\n  setBindings(bindings: Record<string, Binding>): void {\n    if (!isObjectEmpty(this.props.bindings)) {\n      Object.assign(this.props.bindings, bindings);\n      // Set up the bindings\n      this._bindGroup = getBindGroup(\n        this.device.handle,\n        this._bindGroupLayout,\n        this.props.layout,\n        this.props.bindings\n      );\n    }\n  }\n\n  setUniforms(uniforms: Record<string, any>): void {\n    if (!isObjectEmpty(uniforms)) {\n      throw new Error('WebGPU does not support uniforms');\n    }\n  }\n\n  _getBuffers() {\n    return this._buffers;\n  }\n\n  /** Return a bind group created by setBindings */\n  _getBindGroup() {\n    // assert(this._bindGroup);\n    return this._bindGroup;\n  }\n\n  /** Populate the complex WebGPU GPURenderPipelineDescriptor */\n  protected _getRenderPipelineDescriptor() {\n    // Set up the vertex stage\n    const vertex: GPUVertexState = {\n      module: cast<WebGPUShader>(this.props.vs).handle,\n      entryPoint: this.props.vsEntryPoint || 'main',\n      buffers: getVertexBufferLayout(this.props.layout, this.props.bufferMap)\n    };\n\n    // Set up the fragment stage\n    let fragment: GPUFragmentState | undefined;\n    if (this.props.fs) {\n      fragment = {\n        module: cast<WebGPUShader>(this.props.fs).handle,\n        entryPoint: this.props.fsEntryPoint || 'main',\n        targets: [\n          {\n            format: getWebGPUTextureFormat(this.device.canvasContext.format)\n          }\n        ]\n      };\n    }\n\n    // Create a partially populated descriptor\n    let descriptor: GPURenderPipelineDescriptor = {\n      vertex,\n      fragment,\n      primitive: {\n        topology: this.props.topology\n      }\n    };\n\n    // Set parameters on the descriptor\n    applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);\n\n    return descriptor;\n  }\n\n  draw(options: {\n    renderPass?: RenderPass;\n    vertexCount?: number;\n    indexCount?: number;\n    instanceCount?: number;\n    firstVertex?: number;\n    firstIndex?: number;\n    firstInstance?: number;\n    baseVertex?: number;\n  }): void {\n    const webgpuRenderPass =\n      cast<WebGPURenderPass>(options.renderPass) || this.device.getDefaultRenderPass();\n\n    // Set pipeline\n    webgpuRenderPass.handle.setPipeline(this.handle);\n\n    // Set bindings (uniform buffers, textures etc)\n    if (this._getBindGroup()) {\n      webgpuRenderPass.handle.setBindGroup(0, this._getBindGroup());\n    }\n\n    // Set attributes\n    this._setAttributeBuffers(webgpuRenderPass);\n\n    // Draw\n    if (options.indexCount) {\n      webgpuRenderPass.handle.drawIndexed(\n        options.indexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.baseVertex,\n        options.firstInstance\n      );\n    } else {\n      webgpuRenderPass.handle.draw(\n        options.vertexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.firstInstance\n      );\n    }\n  }\n\n  _setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {\n    if (this._indexBuffer) {\n      webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);\n    }\n\n    const buffers = this._getBuffers();\n    for (let i = 0; i < buffers.length; ++i) {\n      const buffer = cast<WebGPUBuffer>(buffers[i]);\n      if (!buffer) {\n        const attribute = this.props.layout.attributes.find(\n          (attribute) => attribute.location === i\n        );\n        throw new Error(\n          `No buffer provided for attribute '${attribute?.name || ''}' in Model '${this.props.id}'`\n        );\n      }\n      webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);\n    }\n\n    // TODO - HANDLE buffer maps\n    /*\n    for (const [bufferName, attributeMapping] of Object.entries(this.props.bufferMap)) {\n      const buffer = cast<WebGPUBuffer>(this.props.attributes[bufferName]);\n      if (!buffer) {\n        log.warn(`Missing buffer for buffer map ${bufferName}`)();\n        continue;\n      }\n\n      if ('location' in attributeMapping) {\n        // @ts-expect-error TODO model must not depend on webgpu\n        renderPass.handle.setVertexBuffer(layout.location, buffer.handle);\n      } else {\n        for (const [bufferName, mapping] of Object.entries(attributeMapping)) {\n          // @ts-expect-error TODO model must not depend on webgpu\n          renderPass.handle.setVertexBuffer(field.location, buffer.handle);\n        }\n      }\n    }\n    */\n  }\n}\n"],"file":"webgpu-render-pipeline.js"}
+{"version":3,"file":"webgpu-render-pipeline.js","names":["RenderPipeline","cast","log","isObjectEmpty","applyParametersToRenderPipelineDescriptor","getWebGPUTextureFormat","getBindGroup","getVertexBufferLayout","getBufferSlots","WebGPURenderPipeline","constructor","device","props","handle","vs","fs","_bufferSlots","_buffers","_indexBuffer","_bindGroupLayout","_bindGroup","descriptor","_getRenderPipelineDescriptor","groupCollapsed","id","probe","JSON","stringify","groupEnd","createRenderPipeline","label","shaderLayout","bufferLayout","Array","Object","keys","length","fill","destroy","setIndexBuffer","indexBuffer","setAttributes","attributes","name","buffer","entries","bufferIndex","Error","setConstantAttributes","setBindings","bindings","assign","getBindGroupLayout","setUniforms","uniforms","_getBuffers","_getBindGroup","vertex","module","entryPoint","vsEntryPoint","buffers","fragment","_this$device","fsEntryPoint","targets","format","canvasContext","topology","primitive","layout","parameters","draw","options","webgpuRenderPass","renderPass","getDefaultRenderPass","setPipeline","bindGroup","setBindGroup","_setAttributeBuffers","indexCount","drawIndexed","instanceCount","firstIndex","baseVertex","firstInstance","vertexCount","indexType","i","attribute","find","location","setVertexBuffer"],"sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"sourcesContent":["// luma.gl MIT license\n\nimport type {TypedArray, Binding, UniformValue, RenderPass} from '@luma.gl/core';\nimport {Buffer, RenderPipeline, RenderPipelineProps, cast, log, isObjectEmpty} from '@luma.gl/core';\nimport {applyParametersToRenderPipelineDescriptor} from '../helpers/webgpu-parameters';\nimport {getWebGPUTextureFormat} from '../helpers/convert-texture-format';\nimport {getBindGroup} from '../helpers/get-bind-group';\nimport {getVertexBufferLayout, getBufferSlots} from '../helpers/get-vertex-buffer-layout';\n// import {convertAttributesVertexBufferToLayout} from '../helpers/get-vertex-buffer-layout';\n// import {mapAccessorToWebGPUFormat} from './helpers/accessor-to-format';\n// import type {BufferAccessors} from './webgpu-pipeline';\n\nimport type {WebGPUDevice} from '../webgpu-device';\nimport type {WebGPUBuffer} from './webgpu-buffer';\nimport type {WebGPUShader} from './webgpu-shader';\nimport type {WebGPURenderPass} from './webgpu-render-pass';\n\n// RENDER PIPELINE\n\n/** Creates a new render pipeline when parameters change */\nexport class WebGPURenderPipeline extends RenderPipeline {\n  device: WebGPUDevice;\n  handle: GPURenderPipeline;\n\n  vs: WebGPUShader;\n  fs: WebGPUShader | null = null;\n\n  private _bufferSlots: Record<string, number>;\n  private _buffers: Buffer[];\n  private _indexBuffer: WebGPUBuffer | null = null;\n  // private _firstIndex: number;\n  // private _lastIndex: number;\n\n  /** For internal use to create BindGroups */\n  private _bindGroupLayout: GPUBindGroupLayout | null = null;\n  private _bindGroup: GPUBindGroup | null = null;\n\n  constructor(device: WebGPUDevice, props: RenderPipelineProps) {\n    super(device, props);\n    this.device = device;\n    this.handle = this.props.handle as GPURenderPipeline;\n    if (!this.handle) {\n      const descriptor = this._getRenderPipelineDescriptor();\n      log.groupCollapsed(1, `new WebGPURenderPipeline(${this.id})`)();\n      log.probe(1, JSON.stringify(descriptor, null, 2))();\n      log.groupEnd(1)();\n      this.handle = this.device.handle.createRenderPipeline(descriptor);  \n    }\n    this.handle.label = this.props.id;\n\n    this.vs = cast<WebGPUShader>(props.vs);\n    this.fs = cast<WebGPUShader>(props.fs);\n\n    this._bufferSlots = getBufferSlots(this.props.shaderLayout, this.props.bufferLayout);\n    this._buffers = new Array<Buffer>(Object.keys(this._bufferSlots).length).fill(null);\n  }\n\n  override destroy(): void {\n    // WebGPURenderPipeline has no destroy method.\n  }\n\n  setIndexBuffer(indexBuffer: Buffer): void {\n    this._indexBuffer = cast<WebGPUBuffer>(indexBuffer);\n  }\n\n  setAttributes(attributes: Record<string, Buffer>): void {\n    for (const [name, buffer] of Object.entries(attributes)) {\n      const bufferIndex = this._bufferSlots[name];\n      if (bufferIndex >= 0) {\n        this._buffers[bufferIndex] = buffer;\n      } else {\n        throw new Error(\n          `Setting attribute '${name}' not listed in shader layout for program ${this.id}`\n        );\n      }\n    }\n    // for (let i = 0; i < this._bufferSlots.length; ++i) {\n    //   const bufferName = this._bufferSlots[i];\n    //   if (attributes[bufferName]) {\n    //     this.handle\n    //   }\n    // }\n  }\n\n  setConstantAttributes(attributes: Record<string, TypedArray>): void {\n    throw new Error('not implemented');\n  }\n\n  setBindings(bindings: Record<string, Binding>): void {\n    if (!isObjectEmpty(this.props.bindings)) {\n      // Do we want to save things on CPU side?\n      Object.assign(this.props.bindings, bindings);\n\n      // Get hold of the bind group layout. We don't want to do this unless we know there is at least one bind group\n      this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);\n\n      // Set up the bindings\n      this._bindGroup = getBindGroup(\n        this.device.handle,\n        this._bindGroupLayout,\n        this.props.shaderLayout,\n        this.props.bindings\n      );\n    }\n  }\n\n  setUniforms(uniforms: Record<string, UniformValue>): void {\n    if (!isObjectEmpty(uniforms)) {\n      throw new Error('WebGPU does not support uniforms');\n    }\n  }\n\n  _getBuffers() {\n    return this._buffers;\n  }\n\n  /** Return a bind group created by setBindings */\n  _getBindGroup() {\n    // assert(this._bindGroup);\n    return this._bindGroup;\n  }\n\n  /** \n   * Populate the complex WebGPU GPURenderPipelineDescriptor \n   */\n  protected _getRenderPipelineDescriptor() {\n    // Set up the vertex stage\n    const vertex: GPUVertexState = {\n      module: cast<WebGPUShader>(this.props.vs).handle,\n      entryPoint: this.props.vsEntryPoint || 'main',\n      buffers: getVertexBufferLayout(this.props.shaderLayout, this.props.bufferLayout)\n    };\n\n    // Set up the fragment stage\n    let fragment: GPUFragmentState | undefined;\n    if (this.props.fs) {\n      fragment = {\n        module: cast<WebGPUShader>(this.props.fs).handle,\n        entryPoint: this.props.fsEntryPoint || 'main',\n        targets: [\n          {\n            // TODO exclamation mark hack!\n            format: getWebGPUTextureFormat(this.device?.canvasContext?.format)\n          }\n        ]\n      };\n    }\n\n    // WebGPU has more restrictive topology support than WebGL\n    switch (this.props.topology) {\n      case 'triangle-fan-webgl':\n      case 'line-loop-webgl':\n        throw new Error(`WebGPU does not support primitive topology ${this.props.topology}`);\n      default:\n    }\n\n    // Create a partially populated descriptor\n    const descriptor: GPURenderPipelineDescriptor = {\n      vertex,\n      fragment,\n      primitive: {\n        topology: this.props.topology\n      },\n      layout: 'auto'\n    };\n\n    // Set parameters on the descriptor\n    applyParametersToRenderPipelineDescriptor(descriptor, this.props.parameters);\n\n    return descriptor;\n  }\n\n  draw(options: {\n    renderPass?: RenderPass;\n    vertexCount?: number;\n    indexCount?: number;\n    instanceCount?: number;\n    firstVertex?: number;\n    firstIndex?: number;\n    firstInstance?: number;\n    baseVertex?: number;\n  }): void {\n    const webgpuRenderPass: WebGPURenderPass =\n      cast<WebGPURenderPass>(options.renderPass) || this.device.getDefaultRenderPass();\n\n    // Set pipeline\n    webgpuRenderPass.handle.setPipeline(this.handle);\n\n    // Set bindings (uniform buffers, textures etc)\n    const bindGroup = this._getBindGroup();\n    if (bindGroup) {\n      webgpuRenderPass.handle.setBindGroup(0, bindGroup);\n    }\n\n    // Set attributes\n    this._setAttributeBuffers(webgpuRenderPass);\n\n    // Draw\n    if (options.indexCount) {\n      webgpuRenderPass.handle.drawIndexed(\n        options.indexCount,\n        options.instanceCount,\n        options.firstIndex,\n        options.baseVertex,\n        options.firstInstance\n      );\n    } else {\n      webgpuRenderPass.handle.draw(\n        options.vertexCount || 0,\n        options.instanceCount || 1, // If 0, nothing will be drawn\n        options.firstInstance\n      );\n    }\n  }\n\n  _setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {\n    if (this._indexBuffer) {\n      webgpuRenderPass.handle.setIndexBuffer(this._indexBuffer.handle, this._indexBuffer.props.indexType);\n    }\n\n    const buffers = this._getBuffers();\n    for (let i = 0; i < buffers.length; ++i) {\n      const buffer = cast<WebGPUBuffer>(buffers[i]);\n      if (!buffer) {\n        const attribute = this.props.shaderLayout.attributes.find(\n          (attribute) => attribute.location === i\n        );\n        throw new Error(\n          `No buffer provided for attribute '${attribute?.name || ''}' in Model '${this.props.id}'`\n        );\n      }\n      webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);\n    }\n\n    // TODO - HANDLE buffer maps\n    /*\n    for (const [bufferName, attributeMapping] of Object.entries(this.props.bufferLayout)) {\n      const buffer = cast<WebGPUBuffer>(this.props.attributes[bufferName]);\n      if (!buffer) {\n        log.warn(`Missing buffer for buffer map ${bufferName}`)();\n        continue;\n      }\n\n      if ('location' in attributeMapping) {\n        // @ts-expect-error TODO model must not depend on webgpu\n        renderPass.handle.setVertexBuffer(layout.location, buffer.handle);\n      } else {\n        for (const [bufferName, mapping] of Object.entries(attributeMapping)) {\n          // @ts-expect-error TODO model must not depend on webgpu\n          renderPass.handle.setVertexBuffer(field.location, buffer.handle);\n        }\n      }\n    }\n    */\n  }\n}\n"],"mappings":"AAGA,SAAgBA,cAAc,EAAuBC,IAAI,EAAEC,GAAG,EAAEC,aAAa,QAAO,eAAe;AAAC,SAC5FC,yCAAyC;AAAA,SACzCC,sBAAsB;AAAA,SACtBC,YAAY;AAAA,SACZC,qBAAqB,EAAEC,cAAc;AAa7C,OAAO,MAAMC,oBAAoB,SAAST,cAAc,CAAC;EAiBvDU,WAAWA,CAACC,MAAoB,EAAEC,KAA0B,EAAE;IAC5D,KAAK,CAACD,MAAM,EAAEC,KAAK,CAAC;IAAC,KAjBvBD,MAAM;IAAA,KACNE,MAAM;IAAA,KAENC,EAAE;IAAA,KACFC,EAAE,GAAwB,IAAI;IAAA,KAEtBC,YAAY;IAAA,KACZC,QAAQ;IAAA,KACRC,YAAY,GAAwB,IAAI;IAAA,KAKxCC,gBAAgB,GAA8B,IAAI;IAAA,KAClDC,UAAU,GAAwB,IAAI;IAI5C,IAAI,CAACT,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACE,MAAM,GAAG,IAAI,CAACD,KAAK,CAACC,MAA2B;IACpD,IAAI,CAAC,IAAI,CAACA,MAAM,EAAE;MAChB,MAAMQ,UAAU,GAAG,IAAI,CAACC,4BAA4B,CAAC,CAAC;MACtDpB,GAAG,CAACqB,cAAc,CAAC,CAAC,EAAG,4BAA2B,IAAI,CAACC,EAAG,GAAE,CAAC,CAAC,CAAC;MAC/DtB,GAAG,CAACuB,KAAK,CAAC,CAAC,EAAEC,IAAI,CAACC,SAAS,CAACN,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;MACnDnB,GAAG,CAAC0B,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;MACjB,IAAI,CAACf,MAAM,GAAG,IAAI,CAACF,MAAM,CAACE,MAAM,CAACgB,oBAAoB,CAACR,UAAU,CAAC;IACnE;IACA,IAAI,CAACR,MAAM,CAACiB,KAAK,GAAG,IAAI,CAAClB,KAAK,CAACY,EAAE;IAEjC,IAAI,CAACV,EAAE,GAAGb,IAAI,CAAeW,KAAK,CAACE,EAAE,CAAC;IACtC,IAAI,CAACC,EAAE,GAAGd,IAAI,CAAeW,KAAK,CAACG,EAAE,CAAC;IAEtC,IAAI,CAACC,YAAY,GAAGR,cAAc,CAAC,IAAI,CAACI,KAAK,CAACmB,YAAY,EAAE,IAAI,CAACnB,KAAK,CAACoB,YAAY,CAAC;IACpF,IAAI,CAACf,QAAQ,GAAG,IAAIgB,KAAK,CAASC,MAAM,CAACC,IAAI,CAAC,IAAI,CAACnB,YAAY,CAAC,CAACoB,MAAM,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;EACrF;EAESC,OAAOA,CAAA,EAAS,CAEzB;EAEAC,cAAcA,CAACC,WAAmB,EAAQ;IACxC,IAAI,CAACtB,YAAY,GAAGjB,IAAI,CAAeuC,WAAW,CAAC;EACrD;EAEAC,aAAaA,CAACC,UAAkC,EAAQ;IACtD,KAAK,MAAM,CAACC,IAAI,EAAEC,MAAM,CAAC,IAAIV,MAAM,CAACW,OAAO,CAACH,UAAU,CAAC,EAAE;MACvD,MAAMI,WAAW,GAAG,IAAI,CAAC9B,YAAY,CAAC2B,IAAI,CAAC;MAC3C,IAAIG,WAAW,IAAI,CAAC,EAAE;QACpB,IAAI,CAAC7B,QAAQ,CAAC6B,WAAW,CAAC,GAAGF,MAAM;MACrC,CAAC,MAAM;QACL,MAAM,IAAIG,KAAK,CACZ,sBAAqBJ,IAAK,6CAA4C,IAAI,CAACnB,EAAG,EACjF,CAAC;MACH;IACF;EAOF;EAEAwB,qBAAqBA,CAACN,UAAsC,EAAQ;IAClE,MAAM,IAAIK,KAAK,CAAC,iBAAiB,CAAC;EACpC;EAEAE,WAAWA,CAACC,QAAiC,EAAQ;IACnD,IAAI,CAAC/C,aAAa,CAAC,IAAI,CAACS,KAAK,CAACsC,QAAQ,CAAC,EAAE;MAEvChB,MAAM,CAACiB,MAAM,CAAC,IAAI,CAACvC,KAAK,CAACsC,QAAQ,EAAEA,QAAQ,CAAC;MAG5C,IAAI,CAAC/B,gBAAgB,GAAG,IAAI,CAACA,gBAAgB,IAAI,IAAI,CAACN,MAAM,CAACuC,kBAAkB,CAAC,CAAC,CAAC;MAGlF,IAAI,CAAChC,UAAU,GAAGd,YAAY,CAC5B,IAAI,CAACK,MAAM,CAACE,MAAM,EAClB,IAAI,CAACM,gBAAgB,EACrB,IAAI,CAACP,KAAK,CAACmB,YAAY,EACvB,IAAI,CAACnB,KAAK,CAACsC,QACb,CAAC;IACH;EACF;EAEAG,WAAWA,CAACC,QAAsC,EAAQ;IACxD,IAAI,CAACnD,aAAa,CAACmD,QAAQ,CAAC,EAAE;MAC5B,MAAM,IAAIP,KAAK,CAAC,kCAAkC,CAAC;IACrD;EACF;EAEAQ,WAAWA,CAAA,EAAG;IACZ,OAAO,IAAI,CAACtC,QAAQ;EACtB;EAGAuC,aAAaA,CAAA,EAAG;IAEd,OAAO,IAAI,CAACpC,UAAU;EACxB;EAKUE,4BAA4BA,CAAA,EAAG;IAEvC,MAAMmC,MAAsB,GAAG;MAC7BC,MAAM,EAAEzD,IAAI,CAAe,IAAI,CAACW,KAAK,CAACE,EAAE,CAAC,CAACD,MAAM;MAChD8C,UAAU,EAAE,IAAI,CAAC/C,KAAK,CAACgD,YAAY,IAAI,MAAM;MAC7CC,OAAO,EAAEtD,qBAAqB,CAAC,IAAI,CAACK,KAAK,CAACmB,YAAY,EAAE,IAAI,CAACnB,KAAK,CAACoB,YAAY;IACjF,CAAC;IAGD,IAAI8B,QAAsC;IAC1C,IAAI,IAAI,CAAClD,KAAK,CAACG,EAAE,EAAE;MAAA,IAAAgD,YAAA;MACjBD,QAAQ,GAAG;QACTJ,MAAM,EAAEzD,IAAI,CAAe,IAAI,CAACW,KAAK,CAACG,EAAE,CAAC,CAACF,MAAM;QAChD8C,UAAU,EAAE,IAAI,CAAC/C,KAAK,CAACoD,YAAY,IAAI,MAAM;QAC7CC,OAAO,EAAE,CACP;UAEEC,MAAM,EAAE7D,sBAAsB,EAAA0D,YAAA,GAAC,IAAI,CAACpD,MAAM,cAAAoD,YAAA,gBAAAA,YAAA,GAAXA,YAAA,CAAaI,aAAa,cAAAJ,YAAA,uBAA1BA,YAAA,CAA4BG,MAAM;QACnE,CAAC;MAEL,CAAC;IACH;IAGA,QAAQ,IAAI,CAACtD,KAAK,CAACwD,QAAQ;MACzB,KAAK,oBAAoB;MACzB,KAAK,iBAAiB;QACpB,MAAM,IAAIrB,KAAK,CAAE,8CAA6C,IAAI,CAACnC,KAAK,CAACwD,QAAS,EAAC,CAAC;MACtF;IACF;IAGA,MAAM/C,UAAuC,GAAG;MAC9CoC,MAAM;MACNK,QAAQ;MACRO,SAAS,EAAE;QACTD,QAAQ,EAAE,IAAI,CAACxD,KAAK,CAACwD;MACvB,CAAC;MACDE,MAAM,EAAE;IACV,CAAC;IAGDlE,yCAAyC,CAACiB,UAAU,EAAE,IAAI,CAACT,KAAK,CAAC2D,UAAU,CAAC;IAE5E,OAAOlD,UAAU;EACnB;EAEAmD,IAAIA,CAACC,OASJ,EAAQ;IACP,MAAMC,gBAAkC,GACtCzE,IAAI,CAAmBwE,OAAO,CAACE,UAAU,CAAC,IAAI,IAAI,CAAChE,MAAM,CAACiE,oBAAoB,CAAC,CAAC;IAGlFF,gBAAgB,CAAC7D,MAAM,CAACgE,WAAW,CAAC,IAAI,CAAChE,MAAM,CAAC;IAGhD,MAAMiE,SAAS,GAAG,IAAI,CAACtB,aAAa,CAAC,CAAC;IACtC,IAAIsB,SAAS,EAAE;MACbJ,gBAAgB,CAAC7D,MAAM,CAACkE,YAAY,CAAC,CAAC,EAAED,SAAS,CAAC;IACpD;IAGA,IAAI,CAACE,oBAAoB,CAACN,gBAAgB,CAAC;IAG3C,IAAID,OAAO,CAACQ,UAAU,EAAE;MACtBP,gBAAgB,CAAC7D,MAAM,CAACqE,WAAW,CACjCT,OAAO,CAACQ,UAAU,EAClBR,OAAO,CAACU,aAAa,EACrBV,OAAO,CAACW,UAAU,EAClBX,OAAO,CAACY,UAAU,EAClBZ,OAAO,CAACa,aACV,CAAC;IACH,CAAC,MAAM;MACLZ,gBAAgB,CAAC7D,MAAM,CAAC2D,IAAI,CAC1BC,OAAO,CAACc,WAAW,IAAI,CAAC,EACxBd,OAAO,CAACU,aAAa,IAAI,CAAC,EAC1BV,OAAO,CAACa,aACV,CAAC;IACH;EACF;EAEAN,oBAAoBA,CAACN,gBAAkC,EAAE;IACvD,IAAI,IAAI,CAACxD,YAAY,EAAE;MACrBwD,gBAAgB,CAAC7D,MAAM,CAAC0B,cAAc,CAAC,IAAI,CAACrB,YAAY,CAACL,MAAM,EAAE,IAAI,CAACK,YAAY,CAACN,KAAK,CAAC4E,SAAS,CAAC;IACrG;IAEA,MAAM3B,OAAO,GAAG,IAAI,CAACN,WAAW,CAAC,CAAC;IAClC,KAAK,IAAIkC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG5B,OAAO,CAACzB,MAAM,EAAE,EAAEqD,CAAC,EAAE;MACvC,MAAM7C,MAAM,GAAG3C,IAAI,CAAe4D,OAAO,CAAC4B,CAAC,CAAC,CAAC;MAC7C,IAAI,CAAC7C,MAAM,EAAE;QACX,MAAM8C,SAAS,GAAG,IAAI,CAAC9E,KAAK,CAACmB,YAAY,CAACW,UAAU,CAACiD,IAAI,CACtDD,SAAS,IAAKA,SAAS,CAACE,QAAQ,KAAKH,CACxC,CAAC;QACD,MAAM,IAAI1C,KAAK,CACZ,qCAAoC,CAAA2C,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAE/C,IAAI,KAAI,EAAG,eAAc,IAAI,CAAC/B,KAAK,CAACY,EAAG,GACzF,CAAC;MACH;MACAkD,gBAAgB,CAAC7D,MAAM,CAACgF,eAAe,CAACJ,CAAC,EAAE7C,MAAM,CAAC/B,MAAM,CAAC;IAC3D;EAsBF;AACF"}

package/dist/adapter/resources/webgpu-sampler.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="@webgpu/types" />
-import { Sampler, SamplerProps } from '@luma.gl/api';
-import type WebGPUDevice from '../webgpu-device';
-export declare type WebGPUSamplerProps = SamplerProps & {
+/// <reference types="dist" />
+import { Sampler, SamplerProps } from '@luma.gl/core';
+import type { WebGPUDevice } from '../webgpu-device';
+export type WebGPUSamplerProps = SamplerProps & {
     handle?: GPUSampler;
 };
 /**
  *
  */
-export default class WebGPUSampler extends Sampler {
+export declare class WebGPUSampler extends Sampler {
     readonly device: WebGPUDevice;
     readonly handle: GPUSampler;
     constructor(device: WebGPUDevice, props: WebGPUSamplerProps);

package/dist/adapter/resources/webgpu-sampler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,oBAAY,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAO3D,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAclD,OAAO,IAAI,IAAI;CAGzB"}

package/dist/adapter/resources/webgpu-sampler.js

@@ -1,19 +1,19 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { Sampler } from '@luma.gl/api';
-export default class WebGPUSampler extends Sampler {
+import { Sampler } from '@luma.gl/core';
+export class WebGPUSampler extends Sampler {
   constructor(device, props) {
     super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
+    this.device = void 0;
+    this.handle = void 0;
     this.device = device;
-    this.handle = this.handle || this.device.handle.createSampler(this.props);
+    const samplerProps = {
+      ...this.props
+    };
+    if (samplerProps.type !== 'comparison-sampler') {
+      delete samplerProps.compare;
+    }
+    this.handle = this.handle || this.device.handle.createSampler(samplerProps);
     this.handle.label = this.props.id;
   }
-
   destroy() {}
-
 }
 //# sourceMappingURL=webgpu-sampler.js.map

package/dist/adapter/resources/webgpu-sampler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":["Sampler","WebGPUSampler","constructor","device","props","handle","createSampler","label","id","destroy"],"mappings":";AAAA,SAAQA,OAAR,QAAoC,cAApC;AAUA,eAAe,MAAMC,aAAN,SAA4BD,OAA5B,CAAoC;AAIjDE,EAAAA,WAAW,CAACC,MAAD,EAAuBC,KAAvB,EAAkD;AAC3D,UAAMD,MAAN,EAAcC,KAAd;;AAD2D;;AAAA;;AAE3D,SAAKD,MAAL,GAAcA,MAAd;AACA,SAAKE,MAAL,GAAc,KAAKA,MAAL,IAAe,KAAKF,MAAL,CAAYE,MAAZ,CAAmBC,aAAnB,CAAiC,KAAKF,KAAtC,CAA7B;AACA,SAAKC,MAAL,CAAYE,KAAZ,GAAoB,KAAKH,KAAL,CAAWI,EAA/B;AACD;;AAEDC,EAAAA,OAAO,GAAS,CAEf;;AAbgD","sourcesContent":["import {Sampler, SamplerProps} from '@luma.gl/api';\nimport type WebGPUDevice from '../webgpu-device';\n\nexport type WebGPUSamplerProps = SamplerProps & {\n  handle?: GPUSampler;\n}\n\n/**\n *\n */\nexport default class WebGPUSampler extends Sampler {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUSampler;\n\n  constructor(device: WebGPUDevice, props: WebGPUSamplerProps) {\n    super(device, props);\n    this.device = device;\n    this.handle = this.handle || this.device.handle.createSampler(this.props);\n    this.handle.label = this.props.id;\n  }\n\n  destroy(): void {\n    // this.handle.destroy();\n  }\n}\n"],"file":"webgpu-sampler.js"}
+{"version":3,"file":"webgpu-sampler.js","names":["Sampler","WebGPUSampler","constructor","device","props","handle","samplerProps","type","compare","createSampler","label","id","destroy"],"sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"sourcesContent":["import {Sampler, SamplerProps} from '@luma.gl/core';\nimport type {WebGPUDevice} from '../webgpu-device';\n\nexport type WebGPUSamplerProps = SamplerProps & {\n  handle?: GPUSampler;\n}\n\n/**\n *\n */\nexport class WebGPUSampler extends Sampler {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUSampler;\n\n  constructor(device: WebGPUDevice, props: WebGPUSamplerProps) {\n    super(device, props);\n    this.device = device;\n\n    // Prepare sampler props\n    const samplerProps: Partial<WebGPUSamplerProps> = {...this.props};\n    if (samplerProps.type !== 'comparison-sampler') {\n      delete samplerProps.compare;\n    }\n\n    this.handle = this.handle || this.device.handle.createSampler(samplerProps);\n    this.handle.label = this.props.id;\n  }\n\n  override destroy(): void {\n    // this.handle.destroy();\n  }\n}\n"],"mappings":"AAAA,SAAQA,OAAO,QAAqB,eAAe;AAUnD,OAAO,MAAMC,aAAa,SAASD,OAAO,CAAC;EAIzCE,WAAWA,CAACC,MAAoB,EAAEC,KAAyB,EAAE;IAC3D,KAAK,CAACD,MAAM,EAAEC,KAAK,CAAC;IAAC,KAJdD,MAAM;IAAA,KACNE,MAAM;IAIb,IAAI,CAACF,MAAM,GAAGA,MAAM;IAGpB,MAAMG,YAAyC,GAAG;MAAC,GAAG,IAAI,CAACF;IAAK,CAAC;IACjE,IAAIE,YAAY,CAACC,IAAI,KAAK,oBAAoB,EAAE;MAC9C,OAAOD,YAAY,CAACE,OAAO;IAC7B;IAEA,IAAI,CAACH,MAAM,GAAG,IAAI,CAACA,MAAM,IAAI,IAAI,CAACF,MAAM,CAACE,MAAM,CAACI,aAAa,CAACH,YAAY,CAAC;IAC3E,IAAI,CAACD,MAAM,CAACK,KAAK,GAAG,IAAI,CAACN,KAAK,CAACO,EAAE;EACnC;EAESC,OAAOA,CAAA,EAAS,CAEzB;AACF"}

package/dist/adapter/resources/webgpu-shader.d.ts

@@ -1,18 +1,18 @@
-/// <reference types="@webgpu/types" />
-import type { ShaderProps, CompilerMessage } from '@luma.gl/api';
-import { Shader } from '@luma.gl/api';
-import type WebGPUDevice from '../webgpu-device';
-export declare type WebGPUShaderProps = ShaderProps & {
+/// <reference types="dist" />
+import type { ShaderProps, CompilerMessage } from '@luma.gl/core';
+import { Shader } from '@luma.gl/core';
+import type { WebGPUDevice } from '../webgpu-device';
+export type WebGPUShaderProps = ShaderProps & {
     handle?: GPUShaderModule;
 };
 /**
  * Immutable shader
  */
-export default class WebGPUShader extends Shader {
+export declare class WebGPUShader extends Shader {
     readonly device: WebGPUDevice;
     readonly handle: GPUShaderModule;
     constructor(device: WebGPUDevice, props: WebGPUShaderProps);
-    _checkCompilationError(errorScope: Promise<GPUError>): Promise<void>;
+    _checkCompilationError(errorScope: Promise<GPUError | null>): Promise<void>;
     destroy(): void;
     protected createHandle(): GPUShaderModule;
     /** Returns compilation info for this shader */

package/dist/adapter/resources/webgpu-shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAM,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AAEjD,oBAAY,iBAAiB,GAAG,WAAW,GAAG;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,MAAM;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,iBAAiB;IAYpD,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,OAAO;IAIP,SAAS,CAAC,YAAY,IAAI,eAAe;IAwBzC,+CAA+C;IACzC,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAI7D"}
+{"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,MAAM,EAAM,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,iBAAiB;IAYpD,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE,OAAO,IAAI,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,eAAe;IAwBzC,+CAA+C;IACzC,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAI7D"}

package/dist/adapter/resources/webgpu-shader.js

@@ -1,64 +1,50 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { Shader, log } from '@luma.gl/api';
-export default class WebGPUShader extends Shader {
+import { Shader, log } from '@luma.gl/core';
+export class WebGPUShader extends Shader {
   constructor(device, props) {
     super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
+    this.device = void 0;
+    this.handle = void 0;
     this.device = device;
     this.device.handle.pushErrorScope('validation');
     this.handle = this.props.handle || this.createHandle();
     this.handle.label = this.props.id;
-
     this._checkCompilationError(this.device.handle.popErrorScope());
   }
-
   async _checkCompilationError(errorScope) {
     const error = await errorScope;
-
     if (error) {
       const shaderLog = await this.compilationInfo();
-      log.error("Shader compilation error: ".concat(error.message), shaderLog)();
-      throw new Error("Shader compilation error: ".concat(error.message));
+      log.error(`Shader compilation error: ${error.message}`, shaderLog)();
+      throw new Error(`Shader compilation error: ${error.message}`);
     }
   }
-
   destroy() {}
-
   createHandle() {
     const {
-      source
+      source,
+      stage
     } = this.props;
     let language = this.props.language;
-
-    if (!language) {
+    if (language === 'auto') {
       language = source.includes('->') ? 'wgsl' : 'glsl';
     }
-
     switch (language) {
       case 'wgsl':
         return this.device.handle.createShaderModule({
           code: source
         });
-
       case 'glsl':
         return this.device.handle.createShaderModule({
           code: source,
-          transform: glsl => this.device.glslang.compileGLSL(glsl, type)
+          transform: glsl => this.device.glslang.compileGLSL(glsl, stage)
         });
-
       default:
         throw new Error(language);
     }
   }
-
   async compilationInfo() {
-    const compilationInfo = await this.handle.compilationInfo();
+    const compilationInfo = await this.handle.getCompilationInfo();
     return compilationInfo.messages;
   }
-
 }
 //# sourceMappingURL=webgpu-shader.js.map

package/dist/adapter/resources/webgpu-shader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":["Shader","log","WebGPUShader","constructor","device","props","handle","pushErrorScope","createHandle","label","id","_checkCompilationError","popErrorScope","errorScope","error","shaderLog","compilationInfo","message","Error","destroy","source","language","includes","createShaderModule","code","transform","glsl","glslang","compileGLSL","type","messages"],"mappings":";AACA,SAAQA,MAAR,EAAgBC,GAAhB,QAA0B,cAA1B;AAUA,eAAe,MAAMC,YAAN,SAA2BF,MAA3B,CAAkC;AAI/CG,EAAAA,WAAW,CAACC,MAAD,EAAuBC,KAAvB,EAAiD;AAC1D,UAAMD,MAAN,EAAcC,KAAd;;AAD0D;;AAAA;;AAE1D,SAAKD,MAAL,GAAcA,MAAd;AAEA,SAAKA,MAAL,CAAYE,MAAZ,CAAmBC,cAAnB,CAAkC,YAAlC;AAEA,SAAKD,MAAL,GAAc,KAAKD,KAAL,CAAWC,MAAX,IAAqB,KAAKE,YAAL,EAAnC;AACA,SAAKF,MAAL,CAAYG,KAAZ,GAAoB,KAAKJ,KAAL,CAAWK,EAA/B;;AAEA,SAAKC,sBAAL,CAA4B,KAAKP,MAAL,CAAYE,MAAZ,CAAmBM,aAAnB,EAA5B;AACD;;AAE2B,QAAtBD,sBAAsB,CAACE,UAAD,EAA+C;AACzE,UAAMC,KAAK,GAAG,MAAMD,UAApB;;AACA,QAAIC,KAAJ,EAAW;AACT,YAAMC,SAAS,GAAG,MAAM,KAAKC,eAAL,EAAxB;AACAf,MAAAA,GAAG,CAACa,KAAJ,qCAAuCA,KAAK,CAACG,OAA7C,GAAwDF,SAAxD;AAGA,YAAM,IAAIG,KAAJ,qCAAuCJ,KAAK,CAACG,OAA7C,EAAN;AACD;AACF;;AAEDE,EAAAA,OAAO,GAAG,CAET;;AAESX,EAAAA,YAAY,GAAoB;AACxC,UAAM;AAACY,MAAAA;AAAD,QAAW,KAAKf,KAAtB;AAEA,QAAIgB,QAAQ,GAAG,KAAKhB,KAAL,CAAWgB,QAA1B;;AAEA,QAAI,CAACA,QAAL,EAAe;AAEbA,MAAAA,QAAQ,GAAGD,MAAM,CAACE,QAAP,CAAgB,IAAhB,IAAwB,MAAxB,GAAiC,MAA5C;AACD;;AAED,YAAOD,QAAP;AACE,WAAK,MAAL;AACE,eAAO,KAAKjB,MAAL,CAAYE,MAAZ,CAAmBiB,kBAAnB,CAAsC;AAACC,UAAAA,IAAI,EAAEJ;AAAP,SAAtC,CAAP;;AACF,WAAK,MAAL;AACE,eAAO,KAAKhB,MAAL,CAAYE,MAAZ,CAAmBiB,kBAAnB,CAAsC;AAC3CC,UAAAA,IAAI,EAAEJ,MADqC;AAG3CK,UAAAA,SAAS,EAAGC,IAAD,IAAU,KAAKtB,MAAL,CAAYuB,OAAZ,CAAoBC,WAApB,CAAgCF,IAAhC,EAAsCG,IAAtC;AAHsB,SAAtC,CAAP;;AAKF;AACE,cAAM,IAAIX,KAAJ,CAAUG,QAAV,CAAN;AAVJ;AAYD;;AAGoB,QAAfL,eAAe,GAAwC;AAC3D,UAAMA,eAAe,GAAG,MAAM,KAAKV,MAAL,CAAYU,eAAZ,EAA9B;AACA,WAAOA,eAAe,CAACc,QAAvB;AACD;;AA3D8C","sourcesContent":["import type {ShaderProps, CompilerMessage} from '@luma.gl/api';\nimport {Shader, log} from '@luma.gl/api';\nimport type WebGPUDevice from '../webgpu-device';\n\nexport type WebGPUShaderProps = ShaderProps & {\n  handle?: GPUShaderModule;\n};\n\n/**\n * Immutable shader\n */\nexport default class WebGPUShader extends Shader {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUShaderModule;\n\n  constructor(device: WebGPUDevice, props: WebGPUShaderProps) {\n    super(device, props);\n    this.device = device;\n\n    this.device.handle.pushErrorScope('validation');\n\n    this.handle = this.props.handle || this.createHandle();\n    this.handle.label = this.props.id;\n\n    this._checkCompilationError(this.device.handle.popErrorScope());\n  }\n\n  async _checkCompilationError(errorScope: Promise<GPUError>): Promise<void> {\n    const error = await errorScope as GPUValidationError;\n    if (error) {\n      const shaderLog = await this.compilationInfo();\n      log.error(`Shader compilation error: ${error.message}`, shaderLog)();\n      // Note: Even though this error is asynchronous and thrown after the constructor completes,\n      // it will result in a useful stack trace leading back to the constructor\n      throw new Error(`Shader compilation error: ${error.message}`);\n    }\n  }\n\n  destroy() {\n    // this.handle.destroy();\n  }\n\n  protected createHandle(): GPUShaderModule {\n    const {source} = this.props;\n\n    let language = this.props.language;\n    // Compile from src\n    if (!language) {\n      // wgsl uses C++ \"auto\" style arrow notation\n      language = source.includes('->') ? 'wgsl' : 'glsl';\n    }\n\n    switch(language) {\n      case 'wgsl':\n        return this.device.handle.createShaderModule({code: source});\n      case 'glsl':\n        return this.device.handle.createShaderModule({\n          code: source,\n          // @ts-expect-error\n          transform: (glsl) => this.device.glslang.compileGLSL(glsl, type)\n        });\n      default:\n        throw new Error(language);\n    }\n  }\n\n  /** Returns compilation info for this shader */\n  async compilationInfo(): Promise<readonly CompilerMessage[]> {\n    const compilationInfo = await this.handle.compilationInfo();\n    return compilationInfo.messages;\n  }\n}\n"],"file":"webgpu-shader.js"}
+{"version":3,"file":"webgpu-shader.js","names":["Shader","log","WebGPUShader","constructor","device","props","handle","pushErrorScope","createHandle","label","id","_checkCompilationError","popErrorScope","errorScope","error","shaderLog","compilationInfo","message","Error","destroy","source","stage","language","includes","createShaderModule","code","transform","glsl","glslang","compileGLSL","getCompilationInfo","messages"],"sources":["../../../src/adapter/resources/webgpu-shader.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {ShaderProps, CompilerMessage} from '@luma.gl/core';\nimport {Shader, log} from '@luma.gl/core';\nimport type {WebGPUDevice} from '../webgpu-device';\n\nexport type WebGPUShaderProps = ShaderProps & {\n  handle?: GPUShaderModule;\n};\n\n/**\n * Immutable shader\n */\nexport class WebGPUShader extends Shader {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUShaderModule;\n\n  constructor(device: WebGPUDevice, props: WebGPUShaderProps) {\n    super(device, props);\n    this.device = device;\n\n    this.device.handle.pushErrorScope('validation');\n\n    this.handle = this.props.handle || this.createHandle();\n    this.handle.label = this.props.id;\n\n    this._checkCompilationError(this.device.handle.popErrorScope());\n  }\n\n  async _checkCompilationError(errorScope: Promise<GPUError | null>): Promise<void> {\n    const error = await errorScope as GPUValidationError;\n    if (error) {\n      const shaderLog = await this.compilationInfo();\n      log.error(`Shader compilation error: ${error.message}`, shaderLog)();\n      // Note: Even though this error is asynchronous and thrown after the constructor completes,\n      // it will result in a useful stack trace leading back to the constructor\n      throw new Error(`Shader compilation error: ${error.message}`);\n    }\n  }\n\n  override destroy(): void {\n    // this.handle.destroy();\n  }\n\n  protected createHandle(): GPUShaderModule {\n    const {source, stage} = this.props;\n\n    let language = this.props.language;\n    // Compile from src\n    if (language === 'auto') {\n      // wgsl uses C++ \"auto\" style arrow notation\n      language = source.includes('->') ? 'wgsl' : 'glsl';\n    }\n\n    switch(language) {\n      case 'wgsl':\n        return this.device.handle.createShaderModule({code: source});\n      case 'glsl':\n        return this.device.handle.createShaderModule({\n          code: source,\n          // @ts-expect-error\n          transform: (glsl) => this.device.glslang.compileGLSL(glsl, stage)\n        });\n      default:\n        throw new Error(language);\n    }\n  }\n\n  /** Returns compilation info for this shader */\n  async compilationInfo(): Promise<readonly CompilerMessage[]> {\n    const compilationInfo = await this.handle.getCompilationInfo();\n    return compilationInfo.messages;\n  }\n}\n"],"mappings":"AAIA,SAAQA,MAAM,EAAEC,GAAG,QAAO,eAAe;AAUzC,OAAO,MAAMC,YAAY,SAASF,MAAM,CAAC;EAIvCG,WAAWA,CAACC,MAAoB,EAAEC,KAAwB,EAAE;IAC1D,KAAK,CAACD,MAAM,EAAEC,KAAK,CAAC;IAAC,KAJdD,MAAM;IAAA,KACNE,MAAM;IAIb,IAAI,CAACF,MAAM,GAAGA,MAAM;IAEpB,IAAI,CAACA,MAAM,CAACE,MAAM,CAACC,cAAc,CAAC,YAAY,CAAC;IAE/C,IAAI,CAACD,MAAM,GAAG,IAAI,CAACD,KAAK,CAACC,MAAM,IAAI,IAAI,CAACE,YAAY,CAAC,CAAC;IACtD,IAAI,CAACF,MAAM,CAACG,KAAK,GAAG,IAAI,CAACJ,KAAK,CAACK,EAAE;IAEjC,IAAI,CAACC,sBAAsB,CAAC,IAAI,CAACP,MAAM,CAACE,MAAM,CAACM,aAAa,CAAC,CAAC,CAAC;EACjE;EAEA,MAAMD,sBAAsBA,CAACE,UAAoC,EAAiB;IAChF,MAAMC,KAAK,GAAG,MAAMD,UAAgC;IACpD,IAAIC,KAAK,EAAE;MACT,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACC,eAAe,CAAC,CAAC;MAC9Cf,GAAG,CAACa,KAAK,CAAE,6BAA4BA,KAAK,CAACG,OAAQ,EAAC,EAAEF,SAAS,CAAC,CAAC,CAAC;MAGpE,MAAM,IAAIG,KAAK,CAAE,6BAA4BJ,KAAK,CAACG,OAAQ,EAAC,CAAC;IAC/D;EACF;EAESE,OAAOA,CAAA,EAAS,CAEzB;EAEUX,YAAYA,CAAA,EAAoB;IACxC,MAAM;MAACY,MAAM;MAAEC;IAAK,CAAC,GAAG,IAAI,CAAChB,KAAK;IAElC,IAAIiB,QAAQ,GAAG,IAAI,CAACjB,KAAK,CAACiB,QAAQ;IAElC,IAAIA,QAAQ,KAAK,MAAM,EAAE;MAEvBA,QAAQ,GAAGF,MAAM,CAACG,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,MAAM;IACpD;IAEA,QAAOD,QAAQ;MACb,KAAK,MAAM;QACT,OAAO,IAAI,CAAClB,MAAM,CAACE,MAAM,CAACkB,kBAAkB,CAAC;UAACC,IAAI,EAAEL;QAAM,CAAC,CAAC;MAC9D,KAAK,MAAM;QACT,OAAO,IAAI,CAAChB,MAAM,CAACE,MAAM,CAACkB,kBAAkB,CAAC;UAC3CC,IAAI,EAAEL,MAAM;UAEZM,SAAS,EAAGC,IAAI,IAAK,IAAI,CAACvB,MAAM,CAACwB,OAAO,CAACC,WAAW,CAACF,IAAI,EAAEN,KAAK;QAClE,CAAC,CAAC;MACJ;QACE,MAAM,IAAIH,KAAK,CAACI,QAAQ,CAAC;IAC7B;EACF;EAGA,MAAMN,eAAeA,CAAA,EAAwC;IAC3D,MAAMA,eAAe,GAAG,MAAM,IAAI,CAACV,MAAM,CAACwB,kBAAkB,CAAC,CAAC;IAC9D,OAAOd,eAAe,CAACe,QAAQ;EACjC;AACF"}