@luma.gl/webgpu 9.0.0-alpha.30 → 9.0.0-alpha.32

package/dist/adapter/helpers/get-bind-group.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="dist" />
-import type { ShaderLayout, BindingLayout, Binding } from '@luma.gl/core';
+import type { ShaderLayout, BindingDeclaration, Binding } from '@luma.gl/core';
 /**
  * Create a WebGPU "bind group layout" from an array of luma.gl bindings
  * @note bind groups can be automatically generated by WebGPU.
@@ -8,6 +8,6 @@ export declare function makeBindGroupLayout(device: GPUDevice, layout: GPUBindGr
 /**
  * Create a WebGPU "bind group" from an array of luma.gl bindings
  */
-export declare function getBindGroup(device: GPUDevice, bindGroupLayout: GPUBindGroupLayout, layout: ShaderLayout, bindings: Record<string, Binding>): GPUBindGroup;
-export declare function getShaderLayoutBinding(layout: ShaderLayout, bindingName: string): BindingLayout;
+export declare function getBindGroup(device: GPUDevice, bindGroupLayout: GPUBindGroupLayout, shaderLayout: ShaderLayout, bindings: Record<string, Binding>): GPUBindGroup;
+export declare function getShaderLayoutBinding(shaderLayout: ShaderLayout, bindingName: string): BindingDeclaration;
 //# sourceMappingURL=get-bind-group.d.ts.map

package/dist/adapter/helpers/get-bind-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-bind-group.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-bind-group.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAMxE;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAM1H;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,kBAAkB,EACnC,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,YAAY,CAMd;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAM/F"}
+{"version":3,"file":"get-bind-group.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-bind-group.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAC,YAAY,EAAE,kBAAkB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAM7E;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,OAAO,EAAE,GAClB,kBAAkB,CAMpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,kBAAkB,EACnC,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,YAAY,CAMd;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,MAAM,GAClB,kBAAkB,CAMpB"}

package/dist/adapter/helpers/get-bind-group.js

@@ -2,24 +2,24 @@ import { Buffer, Sampler, Texture, log, cast } from '@luma.gl/core';
 export function makeBindGroupLayout(device, layout, bindings) {
   throw new Error('not implemented');
 }
-export function getBindGroup(device, bindGroupLayout, layout, bindings) {
-  const entries = getBindGroupEntries(bindings, layout);
+export function getBindGroup(device, bindGroupLayout, shaderLayout, bindings) {
+  const entries = getBindGroupEntries(bindings, shaderLayout);
   return device.createBindGroup({
     layout: bindGroupLayout,
     entries
   });
 }
-export function getShaderLayoutBinding(layout, bindingName) {
-  const bindingLayout = layout.bindings.find(binding => binding.name === bindingName);
+export function getShaderLayoutBinding(shaderLayout, bindingName) {
+  const bindingLayout = shaderLayout.bindings.find(binding => binding.name === bindingName);
   if (!bindingLayout) {
     log.warn("Binding ".concat(bindingName, " not set: Not found in shader layout."))();
   }
   return bindingLayout;
 }
-function getBindGroupEntries(bindings, layout) {
+function getBindGroupEntries(bindings, shaderLayout) {
   const entries = [];
   for (const [bindingName, value] of Object.entries(bindings)) {
-    const bindingLayout = getShaderLayoutBinding(layout, bindingName);
+    const bindingLayout = getShaderLayoutBinding(shaderLayout, bindingName);
     if (bindingLayout) {
       entries.push(getBindGroupEntry(value, bindingLayout.location));
     }

package/dist/adapter/helpers/get-bind-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-bind-group.js","names":["Buffer","Sampler","Texture","log","cast","makeBindGroupLayout","device","layout","bindings","Error","getBindGroup","bindGroupLayout","entries","getBindGroupEntries","createBindGroup","getShaderLayoutBinding","bindingName","bindingLayout","find","binding","name","warn","concat","value","Object","push","getBindGroupEntry","location","index","resource","buffer","handle","createView"],"sources":["../../../src/adapter/helpers/get-bind-group.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {ShaderLayout, BindingLayout, Binding} from '@luma.gl/core';\nimport {Buffer, Sampler, Texture, log, cast} from '@luma.gl/core';\nimport type {WebGPUBuffer} from '../resources/webgpu-buffer';\nimport type {WebGPUSampler} from '../resources/webgpu-sampler';\nimport type {WebGPUTexture} from '../resources/webgpu-texture';\n\n/**\n * Create a WebGPU \"bind group layout\" from an array of luma.gl bindings\n * @note bind groups can be automatically generated by WebGPU.\n */\nexport function makeBindGroupLayout(device: GPUDevice, layout: GPUBindGroupLayout, bindings: Binding[]): GPUBindGroupLayout {\n  throw new Error('not implemented');\n  // return device.createBindGroupLayout({\n  //   layout,\n  //   entries: getBindGroupEntries(bindings)\n  // })\n}\n\n/**\n * Create a WebGPU \"bind group\" from an array of luma.gl bindings\n */\nexport function getBindGroup(\n  device: GPUDevice,\n  bindGroupLayout: GPUBindGroupLayout,\n  layout: ShaderLayout,\n  bindings: Record<string, Binding>\n): GPUBindGroup {\n  const entries = getBindGroupEntries(bindings, layout);\n  return device.createBindGroup({\n    layout: bindGroupLayout,\n    entries\n  });\n}\n\nexport function getShaderLayoutBinding(layout: ShaderLayout, bindingName: string): BindingLayout {\n  const bindingLayout = layout.bindings.find(binding => binding.name === bindingName);\n  if (!bindingLayout) {\n    log.warn(`Binding ${bindingName} not set: Not found in shader layout.`)();\n  }\n  return bindingLayout;\n}\n\n/**\n * @param bindings\n * @returns\n */\nfunction getBindGroupEntries(bindings: Record<string, Binding>, layout: ShaderLayout): GPUBindGroupEntry[] {\n  const entries: GPUBindGroupEntry[] = [];\n\n  for (const [bindingName, value] of Object.entries(bindings)) {\n    const bindingLayout = getShaderLayoutBinding(layout, bindingName);\n    if (bindingLayout) {\n      entries.push(getBindGroupEntry(value, bindingLayout.location));\n    }\n  }\n\n  return entries;\n}\n\nfunction getBindGroupEntry(binding: Binding, index: number): GPUBindGroupEntry {\n  if (binding instanceof Buffer) {\n    return {\n      binding: index,\n      resource: {\n        buffer: cast<WebGPUBuffer>(binding).handle\n      }\n    };\n  }\n  if (binding instanceof Sampler) {\n    return {\n      binding: index,\n      resource: cast<WebGPUSampler>(binding).handle\n    };\n  } else if (binding instanceof Texture) {\n    return {\n      binding: index,\n      resource: cast<WebGPUTexture>(binding).handle.createView()\n    };\n  }\n  throw new Error('invalid binding');\n}\n"],"mappings":"AAEA,SAAQA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,IAAI,QAAO,eAAe;AASjE,OAAO,SAASC,mBAAmBA,CAACC,MAAiB,EAAEC,MAA0B,EAAEC,QAAmB,EAAsB;EAC1H,MAAM,IAAIC,KAAK,CAAC,iBAAiB,CAAC;AAKpC;AAKA,OAAO,SAASC,YAAYA,CAC1BJ,MAAiB,EACjBK,eAAmC,EACnCJ,MAAoB,EACpBC,QAAiC,EACnB;EACd,MAAMI,OAAO,GAAGC,mBAAmB,CAACL,QAAQ,EAAED,MAAM,CAAC;EACrD,OAAOD,MAAM,CAACQ,eAAe,CAAC;IAC5BP,MAAM,EAAEI,eAAe;IACvBC;EACF,CAAC,CAAC;AACJ;AAEA,OAAO,SAASG,sBAAsBA,CAACR,MAAoB,EAAES,WAAmB,EAAiB;EAC/F,MAAMC,aAAa,GAAGV,MAAM,CAACC,QAAQ,CAACU,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,KAAKJ,WAAW,CAAC;EACnF,IAAI,CAACC,aAAa,EAAE;IAClBd,GAAG,CAACkB,IAAI,YAAAC,MAAA,CAAYN,WAAW,0CAAuC,CAAC,CAAC,CAAC;EAC3E;EACA,OAAOC,aAAa;AACtB;AAMA,SAASJ,mBAAmBA,CAACL,QAAiC,EAAED,MAAoB,EAAuB;EACzG,MAAMK,OAA4B,GAAG,EAAE;EAEvC,KAAK,MAAM,CAACI,WAAW,EAAEO,KAAK,CAAC,IAAIC,MAAM,CAACZ,OAAO,CAACJ,QAAQ,CAAC,EAAE;IAC3D,MAAMS,aAAa,GAAGF,sBAAsB,CAACR,MAAM,EAAES,WAAW,CAAC;IACjE,IAAIC,aAAa,EAAE;MACjBL,OAAO,CAACa,IAAI,CAACC,iBAAiB,CAACH,KAAK,EAAEN,aAAa,CAACU,QAAQ,CAAC,CAAC;IAChE;EACF;EAEA,OAAOf,OAAO;AAChB;AAEA,SAASc,iBAAiBA,CAACP,OAAgB,EAAES,KAAa,EAAqB;EAC7E,IAAIT,OAAO,YAAYnB,MAAM,EAAE;IAC7B,OAAO;MACLmB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAE;QACRC,MAAM,EAAE1B,IAAI,CAAee,OAAO,CAAC,CAACY;MACtC;IACF,CAAC;EACH;EACA,IAAIZ,OAAO,YAAYlB,OAAO,EAAE;IAC9B,OAAO;MACLkB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAEzB,IAAI,CAAgBe,OAAO,CAAC,CAACY;IACzC,CAAC;EACH,CAAC,MAAM,IAAIZ,OAAO,YAAYjB,OAAO,EAAE;IACrC,OAAO;MACLiB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAEzB,IAAI,CAAgBe,OAAO,CAAC,CAACY,MAAM,CAACC,UAAU,CAAC;IAC3D,CAAC;EACH;EACA,MAAM,IAAIvB,KAAK,CAAC,iBAAiB,CAAC;AACpC"}
+{"version":3,"file":"get-bind-group.js","names":["Buffer","Sampler","Texture","log","cast","makeBindGroupLayout","device","layout","bindings","Error","getBindGroup","bindGroupLayout","shaderLayout","entries","getBindGroupEntries","createBindGroup","getShaderLayoutBinding","bindingName","bindingLayout","find","binding","name","warn","concat","value","Object","push","getBindGroupEntry","location","index","resource","buffer","handle","createView"],"sources":["../../../src/adapter/helpers/get-bind-group.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {ShaderLayout, BindingDeclaration, Binding} from '@luma.gl/core';\nimport {Buffer, Sampler, Texture, log, cast} from '@luma.gl/core';\nimport type {WebGPUBuffer} from '../resources/webgpu-buffer';\nimport type {WebGPUSampler} from '../resources/webgpu-sampler';\nimport type {WebGPUTexture} from '../resources/webgpu-texture';\n\n/**\n * Create a WebGPU \"bind group layout\" from an array of luma.gl bindings\n * @note bind groups can be automatically generated by WebGPU.\n */\nexport function makeBindGroupLayout(\n  device: GPUDevice,\n  layout: GPUBindGroupLayout,\n  bindings: Binding[]\n): GPUBindGroupLayout {\n  throw new Error('not implemented');\n  // return device.createBindGroupLayout({\n  //   layout,\n  //   entries: getBindGroupEntries(bindings)\n  // })\n}\n\n/**\n * Create a WebGPU \"bind group\" from an array of luma.gl bindings\n */\nexport function getBindGroup(\n  device: GPUDevice,\n  bindGroupLayout: GPUBindGroupLayout,\n  shaderLayout: ShaderLayout,\n  bindings: Record<string, Binding>\n): GPUBindGroup {\n  const entries = getBindGroupEntries(bindings, shaderLayout);\n  return device.createBindGroup({\n    layout: bindGroupLayout,\n    entries\n  });\n}\n\nexport function getShaderLayoutBinding(\n  shaderLayout: ShaderLayout,\n  bindingName: string\n): BindingDeclaration {\n  const bindingLayout = shaderLayout.bindings.find(binding => binding.name === bindingName);\n  if (!bindingLayout) {\n    log.warn(`Binding ${bindingName} not set: Not found in shader layout.`)();\n  }\n  return bindingLayout;\n}\n\n/**\n * @param bindings\n * @returns\n */\nfunction getBindGroupEntries(\n  bindings: Record<string, Binding>,\n  shaderLayout: ShaderLayout\n): GPUBindGroupEntry[] {\n  const entries: GPUBindGroupEntry[] = [];\n\n  for (const [bindingName, value] of Object.entries(bindings)) {\n    const bindingLayout = getShaderLayoutBinding(shaderLayout, bindingName);\n    if (bindingLayout) {\n      entries.push(getBindGroupEntry(value, bindingLayout.location));\n    }\n  }\n\n  return entries;\n}\n\nfunction getBindGroupEntry(binding: Binding, index: number): GPUBindGroupEntry {\n  if (binding instanceof Buffer) {\n    return {\n      binding: index,\n      resource: {\n        buffer: cast<WebGPUBuffer>(binding).handle\n      }\n    };\n  }\n  if (binding instanceof Sampler) {\n    return {\n      binding: index,\n      resource: cast<WebGPUSampler>(binding).handle\n    };\n  } else if (binding instanceof Texture) {\n    return {\n      binding: index,\n      resource: cast<WebGPUTexture>(binding).handle.createView()\n    };\n  }\n  throw new Error('invalid binding');\n}\n"],"mappings":"AAEA,SAAQA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,IAAI,QAAO,eAAe;AASjE,OAAO,SAASC,mBAAmBA,CACjCC,MAAiB,EACjBC,MAA0B,EAC1BC,QAAmB,EACC;EACpB,MAAM,IAAIC,KAAK,CAAC,iBAAiB,CAAC;AAKpC;AAKA,OAAO,SAASC,YAAYA,CAC1BJ,MAAiB,EACjBK,eAAmC,EACnCC,YAA0B,EAC1BJ,QAAiC,EACnB;EACd,MAAMK,OAAO,GAAGC,mBAAmB,CAACN,QAAQ,EAAEI,YAAY,CAAC;EAC3D,OAAON,MAAM,CAACS,eAAe,CAAC;IAC5BR,MAAM,EAAEI,eAAe;IACvBE;EACF,CAAC,CAAC;AACJ;AAEA,OAAO,SAASG,sBAAsBA,CACpCJ,YAA0B,EAC1BK,WAAmB,EACC;EACpB,MAAMC,aAAa,GAAGN,YAAY,CAACJ,QAAQ,CAACW,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,KAAKJ,WAAW,CAAC;EACzF,IAAI,CAACC,aAAa,EAAE;IAClBf,GAAG,CAACmB,IAAI,YAAAC,MAAA,CAAYN,WAAW,0CAAuC,CAAC,CAAC,CAAC;EAC3E;EACA,OAAOC,aAAa;AACtB;AAMA,SAASJ,mBAAmBA,CAC1BN,QAAiC,EACjCI,YAA0B,EACL;EACrB,MAAMC,OAA4B,GAAG,EAAE;EAEvC,KAAK,MAAM,CAACI,WAAW,EAAEO,KAAK,CAAC,IAAIC,MAAM,CAACZ,OAAO,CAACL,QAAQ,CAAC,EAAE;IAC3D,MAAMU,aAAa,GAAGF,sBAAsB,CAACJ,YAAY,EAAEK,WAAW,CAAC;IACvE,IAAIC,aAAa,EAAE;MACjBL,OAAO,CAACa,IAAI,CAACC,iBAAiB,CAACH,KAAK,EAAEN,aAAa,CAACU,QAAQ,CAAC,CAAC;IAChE;EACF;EAEA,OAAOf,OAAO;AAChB;AAEA,SAASc,iBAAiBA,CAACP,OAAgB,EAAES,KAAa,EAAqB;EAC7E,IAAIT,OAAO,YAAYpB,MAAM,EAAE;IAC7B,OAAO;MACLoB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAE;QACRC,MAAM,EAAE3B,IAAI,CAAegB,OAAO,CAAC,CAACY;MACtC;IACF,CAAC;EACH;EACA,IAAIZ,OAAO,YAAYnB,OAAO,EAAE;IAC9B,OAAO;MACLmB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAE1B,IAAI,CAAgBgB,OAAO,CAAC,CAACY;IACzC,CAAC;EACH,CAAC,MAAM,IAAIZ,OAAO,YAAYlB,OAAO,EAAE;IACrC,OAAO;MACLkB,OAAO,EAAES,KAAK;MACdC,QAAQ,EAAE1B,IAAI,CAAgBgB,OAAO,CAAC,CAACY,MAAM,CAACC,UAAU,CAAC;IAC3D,CAAC;EACH;EACA,MAAM,IAAIxB,KAAK,CAAC,iBAAiB,CAAC;AACpC"}

package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="dist" />
-import type { ShaderLayout, BufferMapping } from '@luma.gl/core';
+import type { ShaderLayout, BufferLayout } from '@luma.gl/core';
 /**
  * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.
  * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array
  * @param layout
- * @param bufferMap The buffer map is optional
+ * @param bufferLayout The buffer map is optional
  * @returns WebGPU layout intended for a GPURenderPassDescriptor.
  */
-export declare function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMapping[]): GPUVertexBufferLayout[];
-export declare function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[]): Record<string, number>;
+export declare function getVertexBufferLayout(shaderLayout: ShaderLayout, bufferLayout: BufferLayout[]): GPUVertexBufferLayout[];
+export declare function getBufferSlots(shaderLayout: ShaderLayout, bufferLayout: BufferLayout[]): Record<string, number>;
 //# sourceMappingURL=get-vertex-buffer-layout.d.ts.map

package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-vertex-buffer-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAgC,MAAM,eAAe,CAAC;AAW9F;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,qBAAqB,EAAE,CAkE/G;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BvG"}
+{"version":3,"file":"get-vertex-buffer-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAqC,MAAM,eAAe,CAAC;AAWlG;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,GAC3B,qBAAqB,EAAE,CAoEzB;AAED,wBAAgB,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BxB"}

package/dist/adapter/helpers/get-vertex-buffer-layout.js

@@ -5,31 +5,31 @@ function getWebGPUVertexFormat(format) {
   }
   return format;
 }
-export function getVertexBufferLayout(layout, bufferMap) {
+export function getVertexBufferLayout(shaderLayout, bufferLayout) {
   const vertexBufferLayouts = [];
   const usedAttributes = new Set();
-  for (const mapping of bufferMap) {
+  for (const mapping of bufferLayout) {
     const vertexAttributes = [];
     let stepMode = 'vertex';
     let byteStride = 0;
     const byteOffset = mapping.byteOffset || 0;
-    if ('attributes' in mapping) {
+    if (mapping.attributes) {
       for (const interleaved of mapping.attributes) {
-        const attributeLayout = findAttributeLayout(layout, interleaved.name, usedAttributes);
+        const attributeLayout = findAttributeLayout(shaderLayout, interleaved.name, usedAttributes);
         stepMode = attributeLayout.stepMode || 'vertex';
         vertexAttributes.push({
-          format: getWebGPUVertexFormat(attributeLayout.format),
+          format: getWebGPUVertexFormat(interleaved.format || mapping.format),
           offset: byteOffset + byteStride,
           shaderLocation: attributeLayout.location
         });
-        byteStride += decodeVertexFormat(attributeLayout.format).byteLength;
+        byteStride += decodeVertexFormat(mapping.format).byteLength;
       }
     } else {
-      const attributeLayout = findAttributeLayout(layout, mapping.name, usedAttributes);
-      byteStride = decodeVertexFormat(attributeLayout.format).byteLength;
+      const attributeLayout = findAttributeLayout(shaderLayout, mapping.name, usedAttributes);
+      byteStride = decodeVertexFormat(mapping.format).byteLength;
       stepMode = attributeLayout.stepMode || 'vertex';
       vertexAttributes.push({
-        format: getWebGPUVertexFormat(attributeLayout.format),
+        format: getWebGPUVertexFormat(mapping.format),
         offset: byteOffset,
         shaderLocation: attributeLayout.location
       });
@@ -40,13 +40,13 @@ export function getVertexBufferLayout(layout, bufferMap) {
       attributes: vertexAttributes
     });
   }
-  for (const attribute of layout.attributes) {
+  for (const attribute of shaderLayout.attributes) {
     if (!usedAttributes.has(attribute.name)) {
       vertexBufferLayouts.push({
-        arrayStride: decodeVertexFormat(attribute.format).byteLength,
+        arrayStride: decodeVertexFormat('float32x3').byteLength,
         stepMode: attribute.stepMode || 'vertex',
         attributes: [{
-          format: getWebGPUVertexFormat(attribute.format),
+          format: getWebGPUVertexFormat('float32x3'),
           offset: 0,
           shaderLocation: attribute.location
         }]
@@ -55,11 +55,11 @@ export function getVertexBufferLayout(layout, bufferMap) {
   }
   return vertexBufferLayouts;
 }
-export function getBufferSlots(layout, bufferMap) {
+export function getBufferSlots(shaderLayout, bufferLayout) {
   const usedAttributes = new Set();
   let bufferSlot = 0;
   const bufferSlots = {};
-  for (const mapping of bufferMap) {
+  for (const mapping of bufferLayout) {
     if ('attributes' in mapping) {
       for (const interleaved of mapping.attributes) {
         usedAttributes.add(interleaved.name);
@@ -69,15 +69,15 @@ export function getBufferSlots(layout, bufferMap) {
     }
     bufferSlots[mapping.name] = bufferSlot++;
   }
-  for (const attribute of layout.attributes) {
+  for (const attribute of shaderLayout.attributes) {
     if (!usedAttributes.has(attribute.name)) {
       bufferSlots[attribute.name] = bufferSlot++;
     }
   }
   return bufferSlots;
 }
-function findAttributeLayout(layout, name, attributeNames) {
-  const attribute = layout.attributes.find(attribute => attribute.name === name);
+function findAttributeLayout(shaderLayout, name, attributeNames) {
+  const attribute = shaderLayout.attributes.find(attribute => attribute.name === name);
   if (!attribute) {
     throw new Error("Unknown attribute ".concat(name));
   }

package/dist/adapter/helpers/get-vertex-buffer-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-vertex-buffer-layout.js","names":["decodeVertexFormat","getWebGPUVertexFormat","format","endsWith","Error","concat","getVertexBufferLayout","layout","bufferMap","vertexBufferLayouts","usedAttributes","Set","mapping","vertexAttributes","stepMode","byteStride","byteOffset","interleaved","attributes","attributeLayout","findAttributeLayout","name","push","offset","shaderLocation","location","byteLength","arrayStride","attribute","has","getBufferSlots","bufferSlot","bufferSlots","add","attributeNames","find"],"sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"sourcesContent":["import type {ShaderLayout, BufferMapping, AttributeLayout, VertexFormat} from '@luma.gl/core';\nimport {decodeVertexFormat} from '@luma.gl/core';\n\n/** Throw error on any WebGL-only vertex formats */\nfunction getWebGPUVertexFormat(format: VertexFormat): GPUVertexFormat {\n  if (format.endsWith('-webgl')) {\n    throw new Error(`WebGPU does not support vertex format ${format}`);\n  }\n  return format as GPUVertexFormat;\n}\n\n/**\n * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.\n * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array\n * @param layout\n * @param bufferMap The buffer map is optional\n * @returns WebGPU layout intended for a GPURenderPassDescriptor.\n */\nexport function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMapping[]): GPUVertexBufferLayout[] {\n  const vertexBufferLayouts: GPUVertexBufferLayout[] = [];\n  const usedAttributes = new Set<string>();\n\n  // First handle any buffers mentioned in `bufferMapping`\n  for (const mapping of bufferMap) {\n    // Build vertex attributes for one buffer\n    const vertexAttributes: GPUVertexAttribute[] = [];\n\n    // TODO verify that all stepModes for one buffer are the same\n    let stepMode: 'vertex' | 'instance' = 'vertex';\n    let byteStride = 0;\n    const byteOffset = mapping.byteOffset || 0;\n\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if ('attributes' in mapping) {\n      // const arrayStride = mapping.byteStride; TODO \n      for (const interleaved of mapping.attributes) {\n        const attributeLayout = findAttributeLayout(layout, interleaved.name, usedAttributes);\n\n        stepMode = attributeLayout.stepMode || 'vertex';\n        vertexAttributes.push({\n          format: getWebGPUVertexFormat(attributeLayout.format),\n          offset: byteOffset + byteStride,\n          shaderLocation: attributeLayout.location\n        });\n\n        byteStride += decodeVertexFormat(attributeLayout.format).byteLength;\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      const attributeLayout = findAttributeLayout(layout, mapping.name, usedAttributes);\n      byteStride = decodeVertexFormat(attributeLayout.format).byteLength;\n\n      stepMode = attributeLayout.stepMode || 'vertex';\n      vertexAttributes.push({\n        format: getWebGPUVertexFormat(attributeLayout.format),\n        offset: byteOffset,\n        shaderLocation: attributeLayout.location\n      });\n    }\n\n    // Store all the attribute bindings for one buffer\n    vertexBufferLayouts.push({\n      arrayStride: mapping.byteStride || byteStride,\n      stepMode: stepMode || 'vertex',\n      attributes: vertexAttributes\n    });\n  }\n\n  // Add any non-mapped attributes\n  for (const attribute of layout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      vertexBufferLayouts.push({\n        arrayStride: decodeVertexFormat(attribute.format).byteLength,\n        stepMode: attribute.stepMode || 'vertex',\n        attributes: [{\n          format: getWebGPUVertexFormat(attribute.format),\n          offset: 0,\n          shaderLocation: attribute.location\n        }]\n      });\n    }\n  }\n\n  return vertexBufferLayouts;\n}\n\nexport function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[]): Record<string, number> {\n  const usedAttributes = new Set<string>();\n  let bufferSlot = 0;\n  const bufferSlots: Record<string, number> = {};\n\n  // First handle any buffers mentioned in `bufferMapping`\n  for (const mapping of bufferMap) {\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if ('attributes' in mapping) {\n      for (const interleaved of mapping.attributes) {\n        usedAttributes.add(interleaved.name);\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      usedAttributes.add(mapping.name);\n    }\n    bufferSlots[mapping.name] = bufferSlot++;\n  }\n\n  // Add any non-mapped attributes\n  for (const attribute of layout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      bufferSlots[attribute.name] = bufferSlot++;\n    }\n  }\n\n  return bufferSlots;\n}\n\n/**\n * Looks up an attribute in the ShaderLayout.\n * @throws if name is not in ShaderLayout\n * @throws if name has already been referenced\n */\nfunction findAttributeLayout(layout: ShaderLayout, name: string, attributeNames: Set<string>): AttributeLayout {\n  const attribute = layout.attributes.find(attribute => attribute.name === name);\n  if (!attribute) {\n    throw new Error(`Unknown attribute ${name}`);\n  }\n  if (attributeNames.has(name)) {\n    throw new Error(`Duplicate attribute ${name}`);\n  }\n  attributeNames.add(name);\n  return attribute;\n}\n"],"mappings":"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"}
+{"version":3,"file":"get-vertex-buffer-layout.js","names":["decodeVertexFormat","getWebGPUVertexFormat","format","endsWith","Error","concat","getVertexBufferLayout","shaderLayout","bufferLayout","vertexBufferLayouts","usedAttributes","Set","mapping","vertexAttributes","stepMode","byteStride","byteOffset","attributes","interleaved","attributeLayout","findAttributeLayout","name","push","offset","shaderLocation","location","byteLength","arrayStride","attribute","has","getBufferSlots","bufferSlot","bufferSlots","add","attributeNames","find"],"sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"sourcesContent":["import type {ShaderLayout, BufferLayout, AttributeDeclaration, VertexFormat} from '@luma.gl/core';\nimport {decodeVertexFormat} from '@luma.gl/core';\n\n/** Throw error on any WebGL-only vertex formats */\nfunction getWebGPUVertexFormat(format: VertexFormat): GPUVertexFormat {\n  if (format.endsWith('-webgl')) {\n    throw new Error(`WebGPU does not support vertex format ${format}`);\n  }\n  return format as GPUVertexFormat;\n}\n\n/**\n * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.\n * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array\n * @param layout\n * @param bufferLayout The buffer map is optional\n * @returns WebGPU layout intended for a GPURenderPassDescriptor.\n */\nexport function getVertexBufferLayout(\n  shaderLayout: ShaderLayout,\n  bufferLayout: BufferLayout[]\n): GPUVertexBufferLayout[] {\n  const vertexBufferLayouts: GPUVertexBufferLayout[] = [];\n  const usedAttributes = new Set<string>();\n\n  // First handle any buffers mentioned in `bufferLayout`\n  for (const mapping of bufferLayout) {\n    // Build vertex attributes for one buffer\n    const vertexAttributes: GPUVertexAttribute[] = [];\n\n    // TODO verify that all stepModes for one buffer are the same\n    let stepMode: 'vertex' | 'instance' = 'vertex';\n    let byteStride = 0;\n    const byteOffset = mapping.byteOffset || 0;\n\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if (mapping.attributes) {\n      // const arrayStride = mapping.byteStride; TODO\n      for (const interleaved of mapping.attributes) {\n        const attributeLayout = findAttributeLayout(shaderLayout, interleaved.name, usedAttributes);\n\n        stepMode = attributeLayout.stepMode || 'vertex';\n        vertexAttributes.push({\n          format: getWebGPUVertexFormat(interleaved.format || mapping.format),\n          offset: byteOffset + byteStride,\n          shaderLocation: attributeLayout.location\n        });\n\n        byteStride += decodeVertexFormat(mapping.format).byteLength;\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      const attributeLayout = findAttributeLayout(shaderLayout, mapping.name, usedAttributes);\n      byteStride = decodeVertexFormat(mapping.format).byteLength;\n\n      stepMode = attributeLayout.stepMode || 'vertex';\n      vertexAttributes.push({\n        format: getWebGPUVertexFormat(mapping.format),\n        offset: byteOffset,\n        shaderLocation: attributeLayout.location\n      });\n    }\n\n    // Store all the attribute bindings for one buffer\n    vertexBufferLayouts.push({\n      arrayStride: mapping.byteStride || byteStride,\n      stepMode: stepMode || 'vertex',\n      attributes: vertexAttributes\n    });\n  }\n\n  // Add any non-mapped attributes - TODO - avoid hardcoded types\n  for (const attribute of shaderLayout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      vertexBufferLayouts.push({\n        arrayStride: decodeVertexFormat('float32x3').byteLength,\n        stepMode: attribute.stepMode || 'vertex',\n        attributes: [\n          {\n            format: getWebGPUVertexFormat('float32x3'),\n            offset: 0,\n            shaderLocation: attribute.location\n          }\n        ]\n      });\n    }\n  }\n\n  return vertexBufferLayouts;\n}\n\nexport function getBufferSlots(\n  shaderLayout: ShaderLayout,\n  bufferLayout: BufferLayout[]\n): Record<string, number> {\n  const usedAttributes = new Set<string>();\n  let bufferSlot = 0;\n  const bufferSlots: Record<string, number> = {};\n\n  // First handle any buffers mentioned in `bufferLayout`\n  for (const mapping of bufferLayout) {\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if ('attributes' in mapping) {\n      for (const interleaved of mapping.attributes) {\n        usedAttributes.add(interleaved.name);\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      usedAttributes.add(mapping.name);\n    }\n    bufferSlots[mapping.name] = bufferSlot++;\n  }\n\n  // Add any non-mapped attributes\n  for (const attribute of shaderLayout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      bufferSlots[attribute.name] = bufferSlot++;\n    }\n  }\n\n  return bufferSlots;\n}\n\n/**\n * Looks up an attribute in the ShaderLayout.\n * @throws if name is not in ShaderLayout\n * @throws if name has already been referenced\n */\nfunction findAttributeLayout(\n  shaderLayout: ShaderLayout,\n  name: string,\n  attributeNames: Set<string>\n): AttributeDeclaration {\n  const attribute = shaderLayout.attributes.find(attribute => attribute.name === name);\n  if (!attribute) {\n    throw new Error(`Unknown attribute ${name}`);\n  }\n  if (attributeNames.has(name)) {\n    throw new Error(`Duplicate attribute ${name}`);\n  }\n  attributeNames.add(name);\n  return attribute;\n}\n"],"mappings":"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"}

package/dist/adapter/resources/webgpu-command-encoder.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { CommandEncoder, cast } from '@luma.gl/core';
 export class WebGPUCommandEncoder extends CommandEncoder {
   constructor(device, props) {
-    super(props);
+    super(device, props);
     _defineProperty(this, "device", void 0);
     _defineProperty(this, "handle", void 0);
     this.device = device;

package/dist/adapter/resources/webgpu-command-encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-command-encoder.js","names":["CommandEncoder","cast","WebGPUCommandEncoder","constructor","device","props","_defineProperty","handle","createCommandEncoder","label","id","destroy","finish","options","copyBufferToBuffer","_options$sourceOffset","_options$destinationO","_options$size","source","sourceOffset","destination","destinationOffset","size","copyBufferToTexture","_options$offset","_options$mipLevel","_options$origin","buffer","offset","bytesPerRow","rowsPerImage","texture","mipLevel","origin","width","extent","height","depthOrArrayLayers","copyTextureToBuffer","copyTextureToTexture","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel"],"sources":["../../../src/adapter/resources/webgpu-command-encoder.ts"],"sourcesContent":["import {CommandEncoder, CommandEncoderProps, Buffer, Texture, cast, \n  CopyTextureToTextureOptions, \n  CopyTextureToBufferOptions\n  // CopyBufferToTextureOptions,\n  // CopyBufferToBufferOptions,\n} from '@luma.gl/core';\nimport {WebGPUDevice} from '../webgpu-device';\nimport {WebGPUBuffer} from './webgpu-buffer';\nimport {WebGPUTexture} from './webgpu-texture';\n\nexport class WebGPUCommandEncoder extends CommandEncoder {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUCommandEncoder;\n\n  constructor(device: WebGPUDevice, props: CommandEncoderProps) {\n    super(props);\n    this.device = device;\n    this.handle = props.handle || this.device.handle.createCommandEncoder({\n      // TODO was this removed in standard?\n      // measureExecutionTime: this.props.measureExecutionTime\n    });\n    this.handle.label = this.props.id;\n  }\n\n  override destroy(): void {}\n\n  finish(options?: {id?: string}): GPUCommandBuffer {\n    return this.finish(options);\n  }\n\n  // beginRenderPass(GPURenderPassDescriptor descriptor): GPURenderPassEncoder;\n  // beginComputePass(optional GPUComputePassDescriptor descriptor = {}): GPUComputePassEncoder;\n\n  copyBufferToBuffer(options: // CopyBufferToBufferOptions\n    {\n      source: Buffer,\n      sourceOffset?: number,\n      destination: Buffer,\n      destinationOffset?: number,\n      size?: number\n    }\n  ): void {\n    this.handle.copyBufferToBuffer(\n      cast<WebGPUBuffer>(options.source).handle,\n      options.sourceOffset ?? 0,\n      cast<WebGPUBuffer>(options.destination).handle,\n      options.destinationOffset ?? 0,\n      options.size ?? 0\n    );\n  }\n\n  copyBufferToTexture(options: // CopyBufferToTextureOptions\n    {\n    source: Buffer,\n    offset?: number,\n    bytesPerRow: number,\n    rowsPerImage: number,\n\n    destination: Texture,\n    mipLevel?: number;\n    aspect?: 'all' | 'stencil-only' | 'depth-only',\n\n    origin?: number[] | [number, number, number],\n    extent?: number[] | [number, number, number]\n  }\n  ): void {\n    this.handle.copyBufferToTexture(\n      {\n        buffer: cast<WebGPUBuffer>(options.source).handle,\n        offset: options.offset ?? 0,\n        bytesPerRow: options.bytesPerRow,\n        rowsPerImage: options.rowsPerImage,\n      },\n      {\n        texture: cast<WebGPUTexture>(options.destination).handle,\n        mipLevel: options.mipLevel ?? 0,\n        origin: options.origin ?? {},\n        // aspect: options.aspect\n      },\n      {\n        // TODO exclamation mark hack\n        width: options.extent[0],\n        height: options.extent[1],\n        depthOrArrayLayers: options.extent[2]\n      }\n    );\n  }\n\n  copyTextureToBuffer(options: CopyTextureToBufferOptions): void {\n    // this.handle.copyTextureToBuffer(\n    //   // source\n    //   {},\n    //   // destination\n    //   {},\n    //   // copySize\n    //   {}\n    // );\n  }\n\n  copyTextureToTexture(options: CopyTextureToTextureOptions): void {\n    // this.handle.copyTextureToTexture(\n    //   // source\n    //   {},\n    //   // destination\n    //   {},\n    //   // copySize\n    //   {}\n    // );\n  }\n\n  override pushDebugGroup(groupLabel: string): void {\n    this.handle.pushDebugGroup(groupLabel);\n  }\n\n  override popDebugGroup(): void {\n    this.handle.popDebugGroup();\n  }\n\n  override insertDebugMarker(markerLabel: string): void {\n    this.handle.insertDebugMarker(markerLabel);\n  }\n\n  // writeTimestamp(querySet: Query, queryIndex: number): void {}\n\n  // resolveQuerySet(options: {\n  //   querySet: GPUQuerySet,\n  //   firstQuery: number,\n  //   queryCount: number,\n  //   destination: Buffer,\n  //   destinationOffset?: number;\n  // }): void;\n}"],"mappings":";AAAA,SAAQA,cAAc,EAAwCC,IAAI,QAK3D,eAAe;AAKtB,OAAO,MAAMC,oBAAoB,SAASF,cAAc,CAAC;EAIvDG,WAAWA,CAACC,MAAoB,EAAEC,KAA0B,EAAE;IAC5D,KAAK,CAACA,KAAK,CAAC;IAACC,eAAA;IAAAA,eAAA;IACb,IAAI,CAACF,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACG,MAAM,GAAGF,KAAK,CAACE,MAAM,IAAI,IAAI,CAACH,MAAM,CAACG,MAAM,CAACC,oBAAoB,CAAC,CAGtE,CAAC,CAAC;IACF,IAAI,CAACD,MAAM,CAACE,KAAK,GAAG,IAAI,CAACJ,KAAK,CAACK,EAAE;EACnC;EAESC,OAAOA,CAAA,EAAS,CAAC;EAE1BC,MAAMA,CAACC,OAAuB,EAAoB;IAChD,OAAO,IAAI,CAACD,MAAM,CAACC,OAAO,CAAC;EAC7B;EAKAC,kBAAkBA,CAACD,OAOhB,EACK;IAAA,IAAAE,qBAAA,EAAAC,qBAAA,EAAAC,aAAA;IACN,IAAI,CAACV,MAAM,CAACO,kBAAkB,CAC5Bb,IAAI,CAAeY,OAAO,CAACK,MAAM,CAAC,CAACX,MAAM,GAAAQ,qBAAA,GACzCF,OAAO,CAACM,YAAY,cAAAJ,qBAAA,cAAAA,qBAAA,GAAI,CAAC,EACzBd,IAAI,CAAeY,OAAO,CAACO,WAAW,CAAC,CAACb,MAAM,GAAAS,qBAAA,GAC9CH,OAAO,CAACQ,iBAAiB,cAAAL,qBAAA,cAAAA,qBAAA,GAAI,CAAC,GAAAC,aAAA,GAC9BJ,OAAO,CAACS,IAAI,cAAAL,aAAA,cAAAA,aAAA,GAAI,CAClB,CAAC;EACH;EAEAM,mBAAmBA,CAACV,OAanB,EACO;IAAA,IAAAW,eAAA,EAAAC,iBAAA,EAAAC,eAAA;IACN,IAAI,CAACnB,MAAM,CAACgB,mBAAmB,CAC7B;MACEI,MAAM,EAAE1B,IAAI,CAAeY,OAAO,CAACK,MAAM,CAAC,CAACX,MAAM;MACjDqB,MAAM,GAAAJ,eAAA,GAAEX,OAAO,CAACe,MAAM,cAAAJ,eAAA,cAAAA,eAAA,GAAI,CAAC;MAC3BK,WAAW,EAAEhB,OAAO,CAACgB,WAAW;MAChCC,YAAY,EAAEjB,OAAO,CAACiB;IACxB,CAAC,EACD;MACEC,OAAO,EAAE9B,IAAI,CAAgBY,OAAO,CAACO,WAAW,CAAC,CAACb,MAAM;MACxDyB,QAAQ,GAAAP,iBAAA,GAAEZ,OAAO,CAACmB,QAAQ,cAAAP,iBAAA,cAAAA,iBAAA,GAAI,CAAC;MAC/BQ,MAAM,GAAAP,eAAA,GAAEb,OAAO,CAACoB,MAAM,cAAAP,eAAA,cAAAA,eAAA,GAAI,CAAC;IAE7B,CAAC,EACD;MAEEQ,KAAK,EAAErB,OAAO,CAACsB,MAAM,CAAC,CAAC,CAAC;MACxBC,MAAM,EAAEvB,OAAO,CAACsB,MAAM,CAAC,CAAC,CAAC;MACzBE,kBAAkB,EAAExB,OAAO,CAACsB,MAAM,CAAC,CAAC;IACtC,CACF,CAAC;EACH;EAEAG,mBAAmBA,CAACzB,OAAmC,EAAQ,CAS/D;EAEA0B,oBAAoBA,CAAC1B,OAAoC,EAAQ,CASjE;EAES2B,cAAcA,CAACC,UAAkB,EAAQ;IAChD,IAAI,CAAClC,MAAM,CAACiC,cAAc,CAACC,UAAU,CAAC;EACxC;EAESC,aAAaA,CAAA,EAAS;IAC7B,IAAI,CAACnC,MAAM,CAACmC,aAAa,CAAC,CAAC;EAC7B;EAESC,iBAAiBA,CAACC,WAAmB,EAAQ;IACpD,IAAI,CAACrC,MAAM,CAACoC,iBAAiB,CAACC,WAAW,CAAC;EAC5C;AAWF"}
+{"version":3,"file":"webgpu-command-encoder.js","names":["CommandEncoder","cast","WebGPUCommandEncoder","constructor","device","props","_defineProperty","handle","createCommandEncoder","label","id","destroy","finish","options","copyBufferToBuffer","_options$sourceOffset","_options$destinationO","_options$size","source","sourceOffset","destination","destinationOffset","size","copyBufferToTexture","_options$offset","_options$mipLevel","_options$origin","buffer","offset","bytesPerRow","rowsPerImage","texture","mipLevel","origin","width","extent","height","depthOrArrayLayers","copyTextureToBuffer","copyTextureToTexture","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel"],"sources":["../../../src/adapter/resources/webgpu-command-encoder.ts"],"sourcesContent":["import {CommandEncoder, CommandEncoderProps, Buffer, Texture, cast, \n  CopyTextureToTextureOptions, \n  CopyTextureToBufferOptions\n  // CopyBufferToTextureOptions,\n  // CopyBufferToBufferOptions,\n} from '@luma.gl/core';\nimport {WebGPUDevice} from '../webgpu-device';\nimport {WebGPUBuffer} from './webgpu-buffer';\nimport {WebGPUTexture} from './webgpu-texture';\n\nexport class WebGPUCommandEncoder extends CommandEncoder {\n  readonly device: WebGPUDevice;\n  readonly handle: GPUCommandEncoder;\n\n  constructor(device: WebGPUDevice, props: CommandEncoderProps) {\n    super(device, props);\n    this.device = device;\n    this.handle = props.handle || this.device.handle.createCommandEncoder({\n      // TODO was this removed in standard?\n      // measureExecutionTime: this.props.measureExecutionTime\n    });\n    this.handle.label = this.props.id;\n  }\n\n  override destroy(): void {}\n\n  finish(options?: {id?: string}): GPUCommandBuffer {\n    return this.finish(options);\n  }\n\n  // beginRenderPass(GPURenderPassDescriptor descriptor): GPURenderPassEncoder;\n  // beginComputePass(optional GPUComputePassDescriptor descriptor = {}): GPUComputePassEncoder;\n\n  copyBufferToBuffer(options: // CopyBufferToBufferOptions\n    {\n      source: Buffer,\n      sourceOffset?: number,\n      destination: Buffer,\n      destinationOffset?: number,\n      size?: number\n    }\n  ): void {\n    this.handle.copyBufferToBuffer(\n      cast<WebGPUBuffer>(options.source).handle,\n      options.sourceOffset ?? 0,\n      cast<WebGPUBuffer>(options.destination).handle,\n      options.destinationOffset ?? 0,\n      options.size ?? 0\n    );\n  }\n\n  copyBufferToTexture(options: // CopyBufferToTextureOptions\n    {\n    source: Buffer,\n    offset?: number,\n    bytesPerRow: number,\n    rowsPerImage: number,\n\n    destination: Texture,\n    mipLevel?: number;\n    aspect?: 'all' | 'stencil-only' | 'depth-only',\n\n    origin?: number[] | [number, number, number],\n    extent?: number[] | [number, number, number]\n  }\n  ): void {\n    this.handle.copyBufferToTexture(\n      {\n        buffer: cast<WebGPUBuffer>(options.source).handle,\n        offset: options.offset ?? 0,\n        bytesPerRow: options.bytesPerRow,\n        rowsPerImage: options.rowsPerImage,\n      },\n      {\n        texture: cast<WebGPUTexture>(options.destination).handle,\n        mipLevel: options.mipLevel ?? 0,\n        origin: options.origin ?? {},\n        // aspect: options.aspect\n      },\n      {\n        // TODO exclamation mark hack\n        width: options.extent[0],\n        height: options.extent[1],\n        depthOrArrayLayers: options.extent[2]\n      }\n    );\n  }\n\n  copyTextureToBuffer(options: CopyTextureToBufferOptions): void {\n    // this.handle.copyTextureToBuffer(\n    //   // source\n    //   {},\n    //   // destination\n    //   {},\n    //   // copySize\n    //   {}\n    // );\n  }\n\n  copyTextureToTexture(options: CopyTextureToTextureOptions): void {\n    // this.handle.copyTextureToTexture(\n    //   // source\n    //   {},\n    //   // destination\n    //   {},\n    //   // copySize\n    //   {}\n    // );\n  }\n\n  override pushDebugGroup(groupLabel: string): void {\n    this.handle.pushDebugGroup(groupLabel);\n  }\n\n  override popDebugGroup(): void {\n    this.handle.popDebugGroup();\n  }\n\n  override insertDebugMarker(markerLabel: string): void {\n    this.handle.insertDebugMarker(markerLabel);\n  }\n\n  // writeTimestamp(querySet: Query, queryIndex: number): void {}\n\n  // resolveQuerySet(options: {\n  //   querySet: GPUQuerySet,\n  //   firstQuery: number,\n  //   queryCount: number,\n  //   destination: Buffer,\n  //   destinationOffset?: number;\n  // }): void;\n}"],"mappings":";AAAA,SAAQA,cAAc,EAAwCC,IAAI,QAK3D,eAAe;AAKtB,OAAO,MAAMC,oBAAoB,SAASF,cAAc,CAAC;EAIvDG,WAAWA,CAACC,MAAoB,EAAEC,KAA0B,EAAE;IAC5D,KAAK,CAACD,MAAM,EAAEC,KAAK,CAAC;IAACC,eAAA;IAAAA,eAAA;IACrB,IAAI,CAACF,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACG,MAAM,GAAGF,KAAK,CAACE,MAAM,IAAI,IAAI,CAACH,MAAM,CAACG,MAAM,CAACC,oBAAoB,CAAC,CAGtE,CAAC,CAAC;IACF,IAAI,CAACD,MAAM,CAACE,KAAK,GAAG,IAAI,CAACJ,KAAK,CAACK,EAAE;EACnC;EAESC,OAAOA,CAAA,EAAS,CAAC;EAE1BC,MAAMA,CAACC,OAAuB,EAAoB;IAChD,OAAO,IAAI,CAACD,MAAM,CAACC,OAAO,CAAC;EAC7B;EAKAC,kBAAkBA,CAACD,OAOhB,EACK;IAAA,IAAAE,qBAAA,EAAAC,qBAAA,EAAAC,aAAA;IACN,IAAI,CAACV,MAAM,CAACO,kBAAkB,CAC5Bb,IAAI,CAAeY,OAAO,CAACK,MAAM,CAAC,CAACX,MAAM,GAAAQ,qBAAA,GACzCF,OAAO,CAACM,YAAY,cAAAJ,qBAAA,cAAAA,qBAAA,GAAI,CAAC,EACzBd,IAAI,CAAeY,OAAO,CAACO,WAAW,CAAC,CAACb,MAAM,GAAAS,qBAAA,GAC9CH,OAAO,CAACQ,iBAAiB,cAAAL,qBAAA,cAAAA,qBAAA,GAAI,CAAC,GAAAC,aAAA,GAC9BJ,OAAO,CAACS,IAAI,cAAAL,aAAA,cAAAA,aAAA,GAAI,CAClB,CAAC;EACH;EAEAM,mBAAmBA,CAACV,OAanB,EACO;IAAA,IAAAW,eAAA,EAAAC,iBAAA,EAAAC,eAAA;IACN,IAAI,CAACnB,MAAM,CAACgB,mBAAmB,CAC7B;MACEI,MAAM,EAAE1B,IAAI,CAAeY,OAAO,CAACK,MAAM,CAAC,CAACX,MAAM;MACjDqB,MAAM,GAAAJ,eAAA,GAAEX,OAAO,CAACe,MAAM,cAAAJ,eAAA,cAAAA,eAAA,GAAI,CAAC;MAC3BK,WAAW,EAAEhB,OAAO,CAACgB,WAAW;MAChCC,YAAY,EAAEjB,OAAO,CAACiB;IACxB,CAAC,EACD;MACEC,OAAO,EAAE9B,IAAI,CAAgBY,OAAO,CAACO,WAAW,CAAC,CAACb,MAAM;MACxDyB,QAAQ,GAAAP,iBAAA,GAAEZ,OAAO,CAACmB,QAAQ,cAAAP,iBAAA,cAAAA,iBAAA,GAAI,CAAC;MAC/BQ,MAAM,GAAAP,eAAA,GAAEb,OAAO,CAACoB,MAAM,cAAAP,eAAA,cAAAA,eAAA,GAAI,CAAC;IAE7B,CAAC,EACD;MAEEQ,KAAK,EAAErB,OAAO,CAACsB,MAAM,CAAC,CAAC,CAAC;MACxBC,MAAM,EAAEvB,OAAO,CAACsB,MAAM,CAAC,CAAC,CAAC;MACzBE,kBAAkB,EAAExB,OAAO,CAACsB,MAAM,CAAC,CAAC;IACtC,CACF,CAAC;EACH;EAEAG,mBAAmBA,CAACzB,OAAmC,EAAQ,CAS/D;EAEA0B,oBAAoBA,CAAC1B,OAAoC,EAAQ,CASjE;EAES2B,cAAcA,CAACC,UAAkB,EAAQ;IAChD,IAAI,CAAClC,MAAM,CAACiC,cAAc,CAACC,UAAU,CAAC;EACxC;EAESC,aAAaA,CAAA,EAAS;IAC7B,IAAI,CAACnC,MAAM,CAACmC,aAAa,CAAC,CAAC;EAC7B;EAESC,iBAAiBA,CAACC,WAAmB,EAAQ;IACpD,IAAI,CAACrC,MAAM,CAACoC,iBAAiB,CAACC,WAAW,CAAC;EAC5C;AAWF"}

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

@@ -1,5 +1,5 @@
 /// <reference types="dist" />
-import type { Binding, RenderPass, TypedArray } from '@luma.gl/core';
+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';
@@ -21,11 +21,9 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
     destroy(): void;
     setIndexBuffer(indexBuffer: Buffer): void;
     setAttributes(attributes: Record<string, Buffer>): void;
-    /** Constant attributes are not available in WebGPU */
     setConstantAttributes(attributes: Record<string, TypedArray>): void;
-    /** Set the bindings */
     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;

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":";AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACnE,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,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAc5D,SAAS,CAAC,YAAY,IAAI,iBAAiB;IASlC,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,sDAAsD;IACtD,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAInE,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;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;IAmCR,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,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAA6B;gBAEnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAc5D,SAAS,CAAC,YAAY,IAAI,iBAAiB;IASlC,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;IAapD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;IAMzD,WAAW;IAIX,iDAAiD;IACjD,aAAa;IAKb,8DAA8D;IAC9D,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;IAmCR,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;CAwCxD"}

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

@@ -21,7 +21,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     this.handle.label = this.props.id;
     this.vs = cast(props.vs);
     this.fs = cast(props.fs);
-    this._bufferSlots = getBufferSlots(this.props.layout, this.props.bufferMap);
+    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);
   }
@@ -48,12 +48,12 @@ export class WebGPURenderPipeline extends RenderPipeline {
     }
   }
   setConstantAttributes(attributes) {
-    console.error('not implemented');
+    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._bindGroup = getBindGroup(this.device.handle, this._bindGroupLayout, this.props.shaderLayout, this.props.bindings);
     }
   }
   setUniforms(uniforms) {
@@ -71,7 +71,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     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) {
@@ -123,7 +123,7 @@ export class WebGPURenderPipeline extends RenderPipeline {
     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);
+        const attribute = this.props.shaderLayout.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, "'"));
       }
       webgpuRenderPass.handle.setVertexBuffer(i, buffer.handle);

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

@@ -1 +1 @@
-{"version":3,"file":"webgpu-render-pipeline.js","names":["RenderPipeline","cast","log","isObjectEmpty","applyParametersToRenderPipelineDescriptor","getWebGPUTextureFormat","getBindGroup","getVertexBufferLayout","getBufferSlots","WebGPURenderPipeline","constructor","device","props","_defineProperty","handle","createHandle","label","id","vs","fs","_bufferSlots","layout","bufferMap","_buffers","Array","Object","keys","length","fill","_bindGroupLayout","getBindGroupLayout","descriptor","_getRenderPipelineDescriptor","renderPipeline","createRenderPipeline","groupCollapsed","concat","JSON","stringify","groupEnd","destroy","setIndexBuffer","indexBuffer","_indexBuffer","setAttributes","attributes","name","buffer","entries","bufferIndex","Error","setConstantAttributes","console","error","setBindings","bindings","assign","_bindGroup","setUniforms","uniforms","_getBuffers","_getBindGroup","vertex","module","entryPoint","vsEntryPoint","buffers","fragment","_this$device","fsEntryPoint","targets","format","canvasContext","topology","primitive","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 {Binding, RenderPass, TypedArray} 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;\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) || this.createHandle();\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.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  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  /** Constant attributes are not available in WebGPU */\n  setConstantAttributes(attributes: Record<string, TypedArray>): void {\n    console.error('not implemented');\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            // 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,\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"],"mappings":"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"}
+{"version":3,"file":"webgpu-render-pipeline.js","names":["RenderPipeline","cast","log","isObjectEmpty","applyParametersToRenderPipelineDescriptor","getWebGPUTextureFormat","getBindGroup","getVertexBufferLayout","getBufferSlots","WebGPURenderPipeline","constructor","device","props","_defineProperty","handle","createHandle","label","id","vs","fs","_bufferSlots","shaderLayout","bufferLayout","_buffers","Array","Object","keys","length","fill","_bindGroupLayout","getBindGroupLayout","descriptor","_getRenderPipelineDescriptor","renderPipeline","createRenderPipeline","groupCollapsed","concat","JSON","stringify","groupEnd","destroy","setIndexBuffer","indexBuffer","_indexBuffer","setAttributes","attributes","name","buffer","entries","bufferIndex","Error","setConstantAttributes","setBindings","bindings","assign","_bindGroup","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;\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) || this.createHandle();\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    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  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      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.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  /** 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.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,\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.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":"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"}