@luma.gl/webgpu 9.2.6 → 9.3.0-alpha.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (137) hide show
  1. package/dist/adapter/helpers/cpu-hotspot-profiler.d.ts +54 -0
  2. package/dist/adapter/helpers/cpu-hotspot-profiler.d.ts.map +1 -0
  3. package/dist/adapter/helpers/cpu-hotspot-profiler.js +26 -0
  4. package/dist/adapter/helpers/cpu-hotspot-profiler.js.map +1 -0
  5. package/dist/adapter/helpers/generate-mipmaps-webgpu.d.ts +7 -0
  6. package/dist/adapter/helpers/generate-mipmaps-webgpu.d.ts.map +1 -0
  7. package/dist/adapter/helpers/generate-mipmaps-webgpu.js +490 -0
  8. package/dist/adapter/helpers/generate-mipmaps-webgpu.js.map +1 -0
  9. package/dist/adapter/helpers/get-bind-group.d.ts +8 -6
  10. package/dist/adapter/helpers/get-bind-group.d.ts.map +1 -1
  11. package/dist/adapter/helpers/get-bind-group.js +110 -30
  12. package/dist/adapter/helpers/get-bind-group.js.map +1 -1
  13. package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts +3 -1
  14. package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts.map +1 -1
  15. package/dist/adapter/helpers/get-vertex-buffer-layout.js +17 -12
  16. package/dist/adapter/helpers/get-vertex-buffer-layout.js.map +1 -1
  17. package/dist/adapter/helpers/webgpu-parameters.d.ts.map +1 -1
  18. package/dist/adapter/helpers/webgpu-parameters.js +1 -0
  19. package/dist/adapter/helpers/webgpu-parameters.js.map +1 -1
  20. package/dist/adapter/resources/webgpu-buffer.d.ts +7 -0
  21. package/dist/adapter/resources/webgpu-buffer.d.ts.map +1 -1
  22. package/dist/adapter/resources/webgpu-buffer.js +58 -15
  23. package/dist/adapter/resources/webgpu-buffer.js.map +1 -1
  24. package/dist/adapter/resources/webgpu-command-buffer.js +1 -1
  25. package/dist/adapter/resources/webgpu-command-buffer.js.map +1 -1
  26. package/dist/adapter/resources/webgpu-command-encoder.d.ts +7 -16
  27. package/dist/adapter/resources/webgpu-command-encoder.d.ts.map +1 -1
  28. package/dist/adapter/resources/webgpu-command-encoder.js +89 -32
  29. package/dist/adapter/resources/webgpu-command-encoder.js.map +1 -1
  30. package/dist/adapter/resources/webgpu-compute-pass.d.ts +3 -3
  31. package/dist/adapter/resources/webgpu-compute-pass.d.ts.map +1 -1
  32. package/dist/adapter/resources/webgpu-compute-pass.js +30 -12
  33. package/dist/adapter/resources/webgpu-compute-pass.js.map +1 -1
  34. package/dist/adapter/resources/webgpu-compute-pipeline.d.ts +7 -9
  35. package/dist/adapter/resources/webgpu-compute-pipeline.d.ts.map +1 -1
  36. package/dist/adapter/resources/webgpu-compute-pipeline.js +30 -17
  37. package/dist/adapter/resources/webgpu-compute-pipeline.js.map +1 -1
  38. package/dist/adapter/resources/webgpu-fence.d.ts +13 -0
  39. package/dist/adapter/resources/webgpu-fence.d.ts.map +1 -0
  40. package/dist/adapter/resources/webgpu-fence.js +33 -0
  41. package/dist/adapter/resources/webgpu-fence.js.map +1 -0
  42. package/dist/adapter/resources/webgpu-framebuffer.d.ts +6 -0
  43. package/dist/adapter/resources/webgpu-framebuffer.d.ts.map +1 -1
  44. package/dist/adapter/resources/webgpu-framebuffer.js +16 -0
  45. package/dist/adapter/resources/webgpu-framebuffer.js.map +1 -1
  46. package/dist/adapter/resources/webgpu-pipeline-layout.d.ts +1 -1
  47. package/dist/adapter/resources/webgpu-pipeline-layout.d.ts.map +1 -1
  48. package/dist/adapter/resources/webgpu-pipeline-layout.js +11 -18
  49. package/dist/adapter/resources/webgpu-pipeline-layout.js.map +1 -1
  50. package/dist/adapter/resources/webgpu-query-set.d.ts +33 -4
  51. package/dist/adapter/resources/webgpu-query-set.d.ts.map +1 -1
  52. package/dist/adapter/resources/webgpu-query-set.js +145 -4
  53. package/dist/adapter/resources/webgpu-query-set.js.map +1 -1
  54. package/dist/adapter/resources/webgpu-render-pass.d.ts +6 -3
  55. package/dist/adapter/resources/webgpu-render-pass.d.ts.map +1 -1
  56. package/dist/adapter/resources/webgpu-render-pass.js +78 -34
  57. package/dist/adapter/resources/webgpu-render-pass.js.map +1 -1
  58. package/dist/adapter/resources/webgpu-render-pipeline.d.ts +14 -10
  59. package/dist/adapter/resources/webgpu-render-pipeline.d.ts.map +1 -1
  60. package/dist/adapter/resources/webgpu-render-pipeline.js +62 -35
  61. package/dist/adapter/resources/webgpu-render-pipeline.js.map +1 -1
  62. package/dist/adapter/resources/webgpu-sampler.d.ts.map +1 -1
  63. package/dist/adapter/resources/webgpu-sampler.js +4 -0
  64. package/dist/adapter/resources/webgpu-sampler.js.map +1 -1
  65. package/dist/adapter/resources/webgpu-shader.d.ts.map +1 -1
  66. package/dist/adapter/resources/webgpu-shader.js +17 -1
  67. package/dist/adapter/resources/webgpu-shader.js.map +1 -1
  68. package/dist/adapter/resources/webgpu-texture-view.d.ts +6 -0
  69. package/dist/adapter/resources/webgpu-texture-view.d.ts.map +1 -1
  70. package/dist/adapter/resources/webgpu-texture-view.js +47 -11
  71. package/dist/adapter/resources/webgpu-texture-view.js.map +1 -1
  72. package/dist/adapter/resources/webgpu-texture.d.ts +25 -3
  73. package/dist/adapter/resources/webgpu-texture.d.ts.map +1 -1
  74. package/dist/adapter/resources/webgpu-texture.js +211 -43
  75. package/dist/adapter/resources/webgpu-texture.js.map +1 -1
  76. package/dist/adapter/resources/webgpu-vertex-array.js +1 -1
  77. package/dist/adapter/resources/webgpu-vertex-array.js.map +1 -1
  78. package/dist/adapter/webgpu-adapter.d.ts.map +1 -1
  79. package/dist/adapter/webgpu-adapter.js +35 -35
  80. package/dist/adapter/webgpu-adapter.js.map +1 -1
  81. package/dist/adapter/webgpu-canvas-context.d.ts +6 -3
  82. package/dist/adapter/webgpu-canvas-context.d.ts.map +1 -1
  83. package/dist/adapter/webgpu-canvas-context.js +90 -30
  84. package/dist/adapter/webgpu-canvas-context.js.map +1 -1
  85. package/dist/adapter/webgpu-device.d.ts +12 -2
  86. package/dist/adapter/webgpu-device.d.ts.map +1 -1
  87. package/dist/adapter/webgpu-device.js +176 -19
  88. package/dist/adapter/webgpu-device.js.map +1 -1
  89. package/dist/adapter/webgpu-presentation-context.d.ts +25 -0
  90. package/dist/adapter/webgpu-presentation-context.d.ts.map +1 -0
  91. package/dist/adapter/webgpu-presentation-context.js +144 -0
  92. package/dist/adapter/webgpu-presentation-context.js.map +1 -0
  93. package/dist/dist.dev.js +8160 -551
  94. package/dist/dist.min.js +171 -6
  95. package/dist/index.cjs +2001 -414
  96. package/dist/index.cjs.map +4 -4
  97. package/dist/index.d.ts +2 -0
  98. package/dist/index.d.ts.map +1 -1
  99. package/dist/index.js +2 -0
  100. package/dist/index.js.map +1 -1
  101. package/dist/wgsl/get-shader-layout-wgsl.d.ts +8 -0
  102. package/dist/wgsl/get-shader-layout-wgsl.d.ts.map +1 -0
  103. package/dist/wgsl/get-shader-layout-wgsl.js +144 -0
  104. package/dist/wgsl/get-shader-layout-wgsl.js.map +1 -0
  105. package/package.json +6 -5
  106. package/src/adapter/helpers/cpu-hotspot-profiler.ts +70 -0
  107. package/src/adapter/helpers/generate-mipmaps-webgpu.ts +583 -0
  108. package/src/adapter/helpers/get-bind-group.ts +182 -42
  109. package/src/adapter/helpers/get-vertex-buffer-layout.ts +31 -12
  110. package/src/adapter/helpers/webgpu-parameters.ts +2 -0
  111. package/src/adapter/resources/webgpu-buffer.ts +61 -15
  112. package/src/adapter/resources/webgpu-command-buffer.ts +1 -1
  113. package/src/adapter/resources/webgpu-command-encoder.ts +129 -50
  114. package/src/adapter/resources/webgpu-compute-pass.ts +48 -13
  115. package/src/adapter/resources/webgpu-compute-pipeline.ts +49 -18
  116. package/src/adapter/resources/webgpu-fence.ts +38 -0
  117. package/src/adapter/resources/webgpu-framebuffer.ts +21 -0
  118. package/src/adapter/resources/webgpu-pipeline-layout.ts +18 -17
  119. package/src/adapter/resources/webgpu-query-set.ts +185 -9
  120. package/src/adapter/resources/webgpu-render-pass.ts +92 -40
  121. package/src/adapter/resources/webgpu-render-pipeline.ts +90 -44
  122. package/src/adapter/resources/webgpu-sampler.ts +5 -0
  123. package/src/adapter/resources/webgpu-shader.ts +16 -1
  124. package/src/adapter/resources/webgpu-texture-view.ts +51 -11
  125. package/src/adapter/resources/webgpu-texture.ts +281 -101
  126. package/src/adapter/resources/webgpu-vertex-array.ts +1 -1
  127. package/src/adapter/webgpu-adapter.ts +41 -43
  128. package/src/adapter/webgpu-canvas-context.ts +108 -41
  129. package/src/adapter/webgpu-device.ts +243 -25
  130. package/src/adapter/webgpu-presentation-context.ts +180 -0
  131. package/src/index.ts +3 -0
  132. package/src/wgsl/get-shader-layout-wgsl.ts +165 -0
  133. package/dist/adapter/helpers/accessor-to-format.d.ts +0 -1
  134. package/dist/adapter/helpers/accessor-to-format.d.ts.map +0 -1
  135. package/dist/adapter/helpers/accessor-to-format.js +0 -105
  136. package/dist/adapter/helpers/accessor-to-format.js.map +0 -1
  137. package/src/adapter/helpers/accessor-to-format.ts +0 -104
@@ -20,5 +20,21 @@ export class WebGPUFramebuffer extends Framebuffer {
20
20
  updateAttachments() {
21
21
  // WebGPU framebuffers are JS only objects, nothing to update
22
22
  }
23
+ /**
24
+ * Internal-only hook for the cached CanvasContext/PresentationContext swapchain path.
25
+ * Rebinds the long-lived default framebuffer wrapper to the current per-frame color view
26
+ * and optional depth attachment without allocating a new luma.gl Framebuffer object.
27
+ */
28
+ _reinitialize(colorAttachment, depthStencilAttachment) {
29
+ this.colorAttachments[0] = colorAttachment;
30
+ // @ts-expect-error Internal-only canvas wrapper reuse mutates this otherwise-readonly attachment.
31
+ this.depthStencilAttachment = depthStencilAttachment;
32
+ this.width = colorAttachment.texture.width;
33
+ this.height = colorAttachment.texture.height;
34
+ this.props.width = this.width;
35
+ this.props.height = this.height;
36
+ this.props.colorAttachments = [colorAttachment.texture];
37
+ this.props.depthStencilAttachment = depthStencilAttachment?.texture || null;
38
+ }
23
39
  }
24
40
  //# sourceMappingURL=webgpu-framebuffer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-framebuffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-framebuffer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAI1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACvC,MAAM,CAAe;IACrB,MAAM,GAAG,IAAI,CAAC;IAEd,gBAAgB,GAAwB,EAAE,CAAC;IAC3C,sBAAsB,GAA6B,IAAI,CAAC;IAEjE,YAAY,MAAoB,EAAE,KAAuB;QACvD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,iDAAiD;QACjD,IAAI,CAAC,4BAA4B,EAAE,CAAC;IACtC,CAAC;IAES,iBAAiB;QACzB,6DAA6D;IAC/D,CAAC;CACF"}
1
+ {"version":3,"file":"webgpu-framebuffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-framebuffer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAI1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACvC,MAAM,CAAe;IACrB,MAAM,GAAG,IAAI,CAAC;IAEd,gBAAgB,GAAwB,EAAE,CAAC;IAC3C,sBAAsB,GAA6B,IAAI,CAAC;IAEjE,YAAY,MAAoB,EAAE,KAAuB;QACvD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,iDAAiD;QACjD,IAAI,CAAC,4BAA4B,EAAE,CAAC;IACtC,CAAC;IAES,iBAAiB;QACzB,6DAA6D;IAC/D,CAAC;IAED;;;;OAIG;IACH,aAAa,CACX,eAAkC,EAClC,sBAAgD;QAEhD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC;QAC3C,kGAAkG;QAClG,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC;QAE7C,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,sBAAsB,GAAG,sBAAsB,EAAE,OAAO,IAAI,IAAI,CAAC;IAC9E,CAAC;CACF"}
@@ -5,6 +5,6 @@ export declare class WebGPUPipelineLayout extends PipelineLayout {
5
5
  readonly handle: GPUPipelineLayout;
6
6
  constructor(device: WebGPUDevice, props: PipelineLayoutProps);
7
7
  destroy(): void;
8
- protected mapShaderLayoutToBindGroupEntries(): GPUBindGroupLayoutEntry[];
8
+ protected mapShaderLayoutToBindGroupEntriesByGroup(): GPUBindGroupLayoutEntry[][];
9
9
  }
10
10
  //# sourceMappingURL=webgpu-pipeline-layout.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-pipeline-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,cAAc,EACd,mBAAmB,EAGpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEvB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAqBnD,OAAO,IAAI,IAAI;IAMxB,SAAS,CAAC,iCAAiC,IAAI,uBAAuB,EAAE;CAgFzE"}
1
+ {"version":3,"file":"webgpu-pipeline-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,cAAc,EACd,mBAAmB,EAGpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEvB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAkBnD,OAAO,IAAI,IAAI;IAMxB,SAAS,CAAC,wCAAwC,IAAI,uBAAuB,EAAE,EAAE;CAoFlF"}
@@ -8,18 +8,13 @@ export class WebGPUPipelineLayout extends PipelineLayout {
8
8
  constructor(device, props) {
9
9
  super(device, props);
10
10
  this.device = device;
11
- const bindGroupEntries = this.mapShaderLayoutToBindGroupEntries();
11
+ const bindGroupEntriesByGroup = this.mapShaderLayoutToBindGroupEntriesByGroup();
12
12
  this.handle = this.device.handle.createPipelineLayout({
13
13
  label: props?.id ?? 'unnamed-pipeline-layout',
14
- bindGroupLayouts: [
15
- // TODO (kaapp): We can cache these to re-use them across
16
- // layers, particularly if using a separate group for injected
17
- // bindings (e.g. project/lighting)
18
- this.device.handle.createBindGroupLayout({
19
- label: 'bind-group-layout',
20
- entries: bindGroupEntries
21
- })
22
- ]
14
+ bindGroupLayouts: bindGroupEntriesByGroup.map((entries, group) => this.device.handle.createBindGroupLayout({
15
+ label: `bind-group-layout-${group}`,
16
+ entries
17
+ }))
23
18
  });
24
19
  }
25
20
  destroy() {
@@ -27,12 +22,10 @@ export class WebGPUPipelineLayout extends PipelineLayout {
27
22
  // @ts-expect-error
28
23
  this.handle = null;
29
24
  }
30
- mapShaderLayoutToBindGroupEntries() {
31
- // Set up the pipeline layout
32
- // TODO (kaapp): This only supports the first group, but so does the rest of the code
33
- const bindGroupEntries = [];
34
- for (let i = 0; i < this.props.shaderLayout.bindings.length; i++) {
35
- const binding = this.props.shaderLayout.bindings[i];
25
+ mapShaderLayoutToBindGroupEntriesByGroup() {
26
+ const maxGroup = this.props.shaderLayout.bindings.reduce((highestGroup, binding) => Math.max(highestGroup, binding.group), -1);
27
+ const bindGroupEntriesByGroup = Array.from({ length: maxGroup + 1 }, () => []);
28
+ for (const binding of this.props.shaderLayout.bindings) {
36
29
  const bindingTypeInfo = {};
37
30
  switch (binding.type) {
38
31
  case 'uniform': {
@@ -89,13 +82,13 @@ export class WebGPUPipelineLayout extends PipelineLayout {
89
82
  }
90
83
  }
91
84
  const VISIBILITY_ALL = GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT | GPUShaderStage.COMPUTE;
92
- bindGroupEntries.push({
85
+ bindGroupEntriesByGroup[binding.group].push({
93
86
  binding: binding.location,
94
87
  visibility: binding.visibility || VISIBILITY_ALL,
95
88
  ...bindingTypeInfo
96
89
  });
97
90
  }
98
- return bindGroupEntries;
91
+ return bindGroupEntriesByGroup;
99
92
  }
100
93
  }
101
94
  const isStorageTextureBindingLayout = (maybe) => {
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-pipeline-layout.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,GAAG,EACH,cAAc,EAIf,MAAM,eAAe,CAAC;AAGvB,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IAC7C,MAAM,CAAe;IACrB,MAAM,CAAoB;IAEnC,YAAY,MAAoB,EAAE,KAA0B;QAC1D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iCAAiC,EAAE,CAAC;QAElE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;YACpD,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,yBAAyB;YAC7C,gBAAgB,EAAE;gBAChB,yDAAyD;gBACzD,8DAA8D;gBAC9D,mCAAmC;gBACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBACvC,KAAK,EAAE,mBAAmB;oBAC1B,OAAO,EAAE,gBAAgB;iBAC1B,CAAC;aACH;SACF,CAAC,CAAC;IACL,CAAC;IAEQ,OAAO;QACd,8CAA8C;QAC9C,mBAAmB;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAES,iCAAiC;QACzC,6BAA6B;QAC7B,qFAAqF;QACrF,MAAM,gBAAgB,GAA8B,EAAE,CAAC;QAEvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,eAAe,GAA4D,EAAE,CAAC;YAEpF,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,eAAe,CAAC,MAAM,GAAG;wBACvB,IAAI,EAAE,SAAS;wBACf,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;wBAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;qBACvC,CAAC;oBACF,MAAM;gBACR,CAAC;gBAED,KAAK,mBAAmB,CAAC,CAAC,CAAC;oBACzB,eAAe,CAAC,MAAM,GAAG;wBACvB,IAAI,EAAE,mBAAmB;wBACzB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;wBAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;qBACvC,CAAC;oBACF,MAAM;gBACR,CAAC;gBAED,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,eAAe,CAAC,OAAO,GAAG;wBACxB,IAAI,EAAE,OAAO,CAAC,WAAW;qBAC1B,CAAC;oBACF,MAAM;gBACR,CAAC;gBAED,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,IAAI,6BAA6B,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3C,eAAe,CAAC,cAAc,GAAG;4BAC/B,oEAAoE;4BACpE,iEAAiE;4BACjE,MAAM,EAAE,OAAO,CAAC,MAA0B;4BAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;4BACtB,aAAa,EAAE,OAAO,CAAC,aAAa;yBACrC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,eAAe,CAAC,MAAM,GAAG;4BACvB,IAAI,EAAE,SAAS;4BACf,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;4BAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;yBACvC,CAAC;oBACJ,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,eAAe,CAAC,OAAO,GAAG;wBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,UAAU,EAAE,OAAO,CAAC,UAAU;wBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;qBACrC,CAAC;oBACF,MAAM;gBACR,CAAC;gBAED,OAAO,CAAC,CAAC,CAAC;oBACR,GAAG,CAAC,IAAI,CAAC,0DAA0D,CAAC,EAAE,CAAC;gBACzE,CAAC;YACH,CAAC;YAED,MAAM,cAAc,GAClB,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC;YAE3E,gBAAgB,CAAC,IAAI,CAAC;gBACpB,OAAO,EAAE,OAAO,CAAC,QAAQ;gBACzB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,cAAc;gBAChD,GAAG,eAAe;aACnB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF;AAED,MAAM,6BAA6B,GAAG,CACpC,KAA+D,EACzB,EAAE;IACxC,OAAQ,KAAqC,CAAC,MAAM,KAAK,SAAS,CAAC;AACrE,CAAC,CAAC"}
1
+ {"version":3,"file":"webgpu-pipeline-layout.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,45 @@
1
1
  import { QuerySet, QuerySetProps } from '@luma.gl/core';
2
2
  import { WebGPUDevice } from "../webgpu-device.js";
3
- export type QuerySetProps2 = {
4
- type: 'occlusion' | 'timestamp';
5
- count: number;
6
- };
3
+ import { WebGPUBuffer } from "./webgpu-buffer.js";
7
4
  /**
8
5
  * Immutable
9
6
  */
10
7
  export declare class WebGPUQuerySet extends QuerySet {
11
8
  readonly device: WebGPUDevice;
12
9
  readonly handle: GPUQuerySet;
10
+ protected _resolveBuffer: WebGPUBuffer | null;
11
+ protected _readBuffer: WebGPUBuffer | null;
12
+ protected _cachedResults: bigint[] | null;
13
+ protected _readResultsPromise: Promise<bigint[]> | null;
14
+ protected _resultsPendingResolution: boolean;
13
15
  constructor(device: WebGPUDevice, props: QuerySetProps);
14
16
  destroy(): void;
17
+ isResultAvailable(queryIndex?: number): boolean;
18
+ readResults(options?: {
19
+ firstQuery?: number;
20
+ queryCount?: number;
21
+ }): Promise<bigint[]>;
22
+ readTimestampDuration(beginIndex: number, endIndex: number): Promise<number>;
23
+ /** Marks any cached query results as stale after new writes have been encoded. */
24
+ _invalidateResults(): void;
25
+ protected _readAllResults(): Promise<bigint[]>;
26
+ protected _ensureBuffers(): void;
27
+ _encodeResolveToReadBuffer(commandEncoder: {
28
+ resolveQuerySet: (querySet: WebGPUQuerySet, destination: WebGPUBuffer, options?: {
29
+ firstQuery?: number;
30
+ queryCount?: number;
31
+ destinationOffset?: number;
32
+ }) => void;
33
+ copyBufferToBuffer: (options: {
34
+ sourceBuffer: WebGPUBuffer;
35
+ destinationBuffer: WebGPUBuffer;
36
+ sourceOffset?: number;
37
+ destinationOffset?: number;
38
+ size?: number;
39
+ }) => void;
40
+ }, options?: {
41
+ firstQuery?: number;
42
+ queryCount?: number;
43
+ }): boolean;
15
44
  }
16
45
  //# sourceMappingURL=webgpu-query-set.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa;IAY7C,OAAO,IAAI,IAAI;CAKzB"}
1
+ {"version":3,"file":"webgpu-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAC9C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAM7C;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,cAAc,EAAE,YAAY,GAAG,IAAI,CAAQ;IACrD,SAAS,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IACjD,SAAS,CAAC,mBAAmB,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAQ;IAC/D,SAAS,CAAC,yBAAyB,EAAE,OAAO,CAAS;gBAEzC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa;IAY7C,OAAO,IAAI,IAAI;IASxB,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO;IAUzC,WAAW,CAAC,OAAO,CAAC,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA4BpF,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelF,kFAAkF;IAClF,kBAAkB,IAAI,IAAI;cAKV,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAsCpD,SAAS,CAAC,cAAc,IAAI,IAAI;IAqBhC,0BAA0B,CACxB,cAAc,EAAE;QACd,eAAe,EAAE,CACf,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,YAAY,EACzB,OAAO,CAAC,EAAE;YAAC,UAAU,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,CAAC,EAAE,MAAM,CAAC;YAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;SAAC,KAC7E,IAAI,CAAC;QACV,kBAAkB,EAAE,CAAC,OAAO,EAAE;YAC5B,YAAY,EAAE,YAAY,CAAC;YAC3B,iBAAiB,EAAE,YAAY,CAAC;YAChC,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;YAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,KAAK,IAAI,CAAC;KACZ,EACD,OAAO,CAAC,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAC,GACnD,OAAO;CAgCX"}
@@ -1,13 +1,19 @@
1
1
  // luma.gl
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
- import { QuerySet } from '@luma.gl/core';
4
+ import { Buffer, QuerySet } from '@luma.gl/core';
5
+ import { getCpuHotspotSubmitReason, setCpuHotspotSubmitReason } from "../helpers/cpu-hotspot-profiler.js";
5
6
  /**
6
7
  * Immutable
7
8
  */
8
9
  export class WebGPUQuerySet extends QuerySet {
9
10
  device;
10
11
  handle;
12
+ _resolveBuffer = null;
13
+ _readBuffer = null;
14
+ _cachedResults = null;
15
+ _readResultsPromise = null;
16
+ _resultsPendingResolution = false;
11
17
  constructor(device, props) {
12
18
  super(device, props);
13
19
  this.device = device;
@@ -20,9 +26,144 @@ export class WebGPUQuerySet extends QuerySet {
20
26
  this.handle.label = this.props.id;
21
27
  }
22
28
  destroy() {
23
- this.handle?.destroy();
24
- // @ts-expect-error readonly
25
- this.handle = null;
29
+ if (!this.destroyed) {
30
+ this.handle?.destroy();
31
+ this.destroyResource();
32
+ // @ts-expect-error readonly
33
+ this.handle = null;
34
+ }
35
+ }
36
+ isResultAvailable(queryIndex) {
37
+ if (!this._cachedResults) {
38
+ return false;
39
+ }
40
+ return queryIndex === undefined
41
+ ? true
42
+ : queryIndex >= 0 && queryIndex < this._cachedResults.length;
43
+ }
44
+ async readResults(options) {
45
+ const firstQuery = options?.firstQuery || 0;
46
+ const queryCount = options?.queryCount || this.props.count - firstQuery;
47
+ if (firstQuery < 0 || queryCount < 0 || firstQuery + queryCount > this.props.count) {
48
+ throw new Error('Query read range is out of bounds');
49
+ }
50
+ let needsFreshResults = true;
51
+ while (needsFreshResults) {
52
+ if (!this._readResultsPromise) {
53
+ this._readResultsPromise = this._readAllResults();
54
+ }
55
+ const readResultsPromise = this._readResultsPromise;
56
+ const results = await readResultsPromise;
57
+ // A later submit may have invalidated the query set while this read was in flight.
58
+ // Retry so each caller observes the freshest resolved results instead of stale data.
59
+ needsFreshResults = this._resultsPendingResolution;
60
+ if (!needsFreshResults) {
61
+ return results.slice(firstQuery, firstQuery + queryCount);
62
+ }
63
+ }
64
+ throw new Error('Query read unexpectedly failed to resolve');
65
+ }
66
+ async readTimestampDuration(beginIndex, endIndex) {
67
+ if (this.props.type !== 'timestamp') {
68
+ throw new Error('Timestamp durations require a timestamp QuerySet');
69
+ }
70
+ if (beginIndex < 0 || endIndex <= beginIndex || endIndex >= this.props.count) {
71
+ throw new Error('Timestamp duration range is out of bounds');
72
+ }
73
+ const results = await this.readResults({
74
+ firstQuery: beginIndex,
75
+ queryCount: endIndex - beginIndex + 1
76
+ });
77
+ return Number(results[results.length - 1] - results[0]) / 1e6;
78
+ }
79
+ /** Marks any cached query results as stale after new writes have been encoded. */
80
+ _invalidateResults() {
81
+ this._cachedResults = null;
82
+ this._resultsPendingResolution = true;
83
+ }
84
+ async _readAllResults() {
85
+ this._ensureBuffers();
86
+ try {
87
+ // Use a dedicated encoder so async profiling reads cannot flush or replace the
88
+ // device's active frame encoder while application rendering is in flight.
89
+ if (this._resultsPendingResolution) {
90
+ const commandEncoder = this.device.createCommandEncoder({
91
+ id: `${this.id}-read-results`
92
+ });
93
+ commandEncoder.resolveQuerySet(this, this._resolveBuffer);
94
+ commandEncoder.copyBufferToBuffer({
95
+ sourceBuffer: this._resolveBuffer,
96
+ destinationBuffer: this._readBuffer,
97
+ size: this._resolveBuffer.byteLength
98
+ });
99
+ const commandBuffer = commandEncoder.finish({
100
+ id: `${this.id}-read-results-command-buffer`
101
+ });
102
+ const previousSubmitReason = getCpuHotspotSubmitReason(this.device) || undefined;
103
+ setCpuHotspotSubmitReason(this.device, 'query-readback');
104
+ try {
105
+ this.device.submit(commandBuffer);
106
+ }
107
+ finally {
108
+ setCpuHotspotSubmitReason(this.device, previousSubmitReason);
109
+ }
110
+ }
111
+ const data = await this._readBuffer.readAsync(0, this._readBuffer.byteLength);
112
+ const resultView = new BigUint64Array(data.buffer, data.byteOffset, this.props.count);
113
+ this._cachedResults = Array.from(resultView, value => value);
114
+ this._resultsPendingResolution = false;
115
+ return this._cachedResults;
116
+ }
117
+ finally {
118
+ this._readResultsPromise = null;
119
+ }
120
+ }
121
+ _ensureBuffers() {
122
+ if (this._resolveBuffer && this._readBuffer) {
123
+ return;
124
+ }
125
+ const byteLength = this.props.count * 8;
126
+ this._resolveBuffer = this.device.createBuffer({
127
+ id: `${this.id}-resolve-buffer`,
128
+ usage: Buffer.QUERY_RESOLVE | Buffer.COPY_SRC,
129
+ byteLength
130
+ });
131
+ this.attachResource(this._resolveBuffer);
132
+ this._readBuffer = this.device.createBuffer({
133
+ id: `${this.id}-read-buffer`,
134
+ usage: Buffer.COPY_DST | Buffer.MAP_READ,
135
+ byteLength
136
+ });
137
+ this.attachResource(this._readBuffer);
138
+ }
139
+ _encodeResolveToReadBuffer(commandEncoder, options) {
140
+ if (!this._resultsPendingResolution) {
141
+ return false;
142
+ }
143
+ // If a readback is already mapping the shared read buffer, defer to the fallback read path.
144
+ // That path will submit resolve/copy commands once the current read has completed.
145
+ if (this._readResultsPromise) {
146
+ return false;
147
+ }
148
+ this._ensureBuffers();
149
+ const firstQuery = options?.firstQuery || 0;
150
+ const queryCount = options?.queryCount || this.props.count - firstQuery;
151
+ const byteLength = queryCount * BigUint64Array.BYTES_PER_ELEMENT;
152
+ const byteOffset = firstQuery * BigUint64Array.BYTES_PER_ELEMENT;
153
+ commandEncoder.resolveQuerySet(this, this._resolveBuffer, {
154
+ firstQuery,
155
+ queryCount,
156
+ destinationOffset: byteOffset
157
+ });
158
+ commandEncoder.copyBufferToBuffer({
159
+ sourceBuffer: this._resolveBuffer,
160
+ sourceOffset: byteOffset,
161
+ destinationBuffer: this._readBuffer,
162
+ destinationOffset: byteOffset,
163
+ size: byteLength
164
+ });
165
+ this._resultsPendingResolution = false;
166
+ return true;
26
167
  }
27
168
  }
28
169
  //# sourceMappingURL=webgpu-query-set.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,QAAQ,EAAgB,MAAM,eAAe,CAAC;AAQtD;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,QAAQ;IACjC,MAAM,CAAe;IACrB,MAAM,CAAc;IAE7B,YAAY,MAAoB,EAAE,KAAoB;QACpD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM;YACT,IAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBACrB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;iBACxB,CAAC,CAAC;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACvB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
1
+ {"version":3,"file":"webgpu-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-query-set.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { RenderPassProps, RenderPassParameters, Binding } from '@luma.gl/core';
1
+ import type { RenderPassProps, RenderPassParameters, Bindings, BindingsByGroup } from '@luma.gl/core';
2
2
  import { Buffer, RenderPass, RenderPipeline } from '@luma.gl/core';
3
3
  import { WebGPUDevice } from "../webgpu-device.js";
4
4
  import { WebGPURenderPipeline } from "./webgpu-render-pipeline.js";
@@ -6,14 +6,17 @@ import { WebGPUFramebuffer } from "./webgpu-framebuffer.js";
6
6
  export declare class WebGPURenderPass extends RenderPass {
7
7
  readonly device: WebGPUDevice;
8
8
  readonly handle: GPURenderPassEncoder;
9
+ readonly framebuffer: WebGPUFramebuffer;
9
10
  /** Active pipeline */
10
11
  pipeline: WebGPURenderPipeline | null;
11
- constructor(device: WebGPUDevice, props?: RenderPassProps);
12
+ /** Latest bindings applied to this pass */
13
+ bindings: Bindings | BindingsByGroup;
14
+ constructor(device: WebGPUDevice, props?: RenderPassProps, commandEncoder?: GPUCommandEncoder);
12
15
  destroy(): void;
13
16
  end(): void;
14
17
  setPipeline(pipeline: RenderPipeline): void;
15
18
  /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
16
- setBindings(bindings: Record<string, Binding>): void;
19
+ setBindings(bindings: Bindings | BindingsByGroup): void;
17
20
  setIndexBuffer(buffer: Buffer, indexFormat: GPUIndexFormat, offset?: number, size?: number): void;
18
21
  setVertexBuffer(slot: number, buffer: Buffer, offset?: number): void;
19
22
  draw(options: {
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAM,MAAM,eAAe,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAEvD,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAEtC,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;gBAEjC,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,eAAoB;IAyCpD,OAAO,IAAI,IAAI;IAExB,GAAG,IAAI,IAAI;IAIX,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAQpD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,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;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}
1
+ {"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,QAAQ,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AACpG,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAmC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAGvD,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAExC,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE7C,2CAA2C;IAC3C,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAM;gBAGxC,MAAM,EAAE,YAAY,EACpB,KAAK,GAAE,eAAoB,EAC3B,cAAc,GAAE,iBAAgD;IA0EzD,OAAO,IAAI,IAAI;IAIxB,GAAG,IAAI,IAAI;IAQX,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAavD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,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;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}
@@ -1,49 +1,89 @@
1
1
  // luma.gl
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
- import { RenderPass, log } from '@luma.gl/core';
4
+ import { RenderPass, _getDefaultBindGroupFactory, log } from '@luma.gl/core';
5
+ import { getCpuHotspotProfiler, getTimestamp } from "../helpers/cpu-hotspot-profiler.js";
5
6
  export class WebGPURenderPass extends RenderPass {
6
7
  device;
7
8
  handle;
9
+ framebuffer;
8
10
  /** Active pipeline */
9
11
  pipeline = null;
10
- constructor(device, props = {}) {
12
+ /** Latest bindings applied to this pass */
13
+ bindings = {};
14
+ constructor(device, props = {}, commandEncoder = device.commandEncoder.handle) {
11
15
  super(device, props);
12
16
  this.device = device;
13
- const framebuffer = props.framebuffer || device.getCanvasContext().getCurrentFramebuffer();
14
- const renderPassDescriptor = this.getRenderPassDescriptor(framebuffer);
15
- const webgpuQuerySet = props.timestampQuerySet;
16
- if (webgpuQuerySet) {
17
- renderPassDescriptor.occlusionQuerySet = webgpuQuerySet.handle;
17
+ const { props: renderPassProps } = this;
18
+ this.framebuffer =
19
+ renderPassProps.framebuffer ||
20
+ device.getCanvasContext().getCurrentFramebuffer();
21
+ const profiler = getCpuHotspotProfiler(this.device);
22
+ if (profiler) {
23
+ const counterName = renderPassProps.framebuffer
24
+ ? 'explicitFramebufferRenderPassCount'
25
+ : 'defaultFramebufferRenderPassCount';
26
+ profiler[counterName] = (profiler[counterName] || 0) + 1;
18
27
  }
19
- if (device.features.has('timestamp-query')) {
20
- const webgpuTSQuerySet = props.timestampQuerySet;
21
- renderPassDescriptor.timestampWrites = webgpuTSQuerySet
22
- ? {
23
- querySet: webgpuTSQuerySet.handle,
24
- beginningOfPassWriteIndex: props.beginTimestampIndex,
25
- endOfPassWriteIndex: props.endTimestampIndex
26
- }
27
- : undefined;
28
+ const startTime = profiler ? getTimestamp() : 0;
29
+ try {
30
+ const descriptorAssemblyStartTime = profiler ? getTimestamp() : 0;
31
+ const renderPassDescriptor = this.getRenderPassDescriptor(this.framebuffer);
32
+ if (renderPassProps.occlusionQuerySet) {
33
+ renderPassDescriptor.occlusionQuerySet = renderPassProps.occlusionQuerySet.handle;
34
+ }
35
+ if (renderPassProps.timestampQuerySet) {
36
+ const webgpuTSQuerySet = renderPassProps.timestampQuerySet;
37
+ webgpuTSQuerySet?._invalidateResults();
38
+ renderPassDescriptor.timestampWrites = webgpuTSQuerySet
39
+ ? {
40
+ querySet: webgpuTSQuerySet.handle,
41
+ beginningOfPassWriteIndex: renderPassProps.beginTimestampIndex,
42
+ endOfPassWriteIndex: renderPassProps.endTimestampIndex
43
+ }
44
+ : undefined;
45
+ }
46
+ if (profiler) {
47
+ profiler.renderPassDescriptorAssemblyCount =
48
+ (profiler.renderPassDescriptorAssemblyCount || 0) + 1;
49
+ profiler.renderPassDescriptorAssemblyTimeMs =
50
+ (profiler.renderPassDescriptorAssemblyTimeMs || 0) +
51
+ (getTimestamp() - descriptorAssemblyStartTime);
52
+ }
53
+ this.device.pushErrorScope('validation');
54
+ const beginRenderPassStartTime = profiler ? getTimestamp() : 0;
55
+ this.handle = this.props.handle || commandEncoder.beginRenderPass(renderPassDescriptor);
56
+ if (profiler) {
57
+ profiler.renderPassBeginCount = (profiler.renderPassBeginCount || 0) + 1;
58
+ profiler.renderPassBeginTimeMs =
59
+ (profiler.renderPassBeginTimeMs || 0) + (getTimestamp() - beginRenderPassStartTime);
60
+ }
61
+ this.device.popErrorScope((error) => {
62
+ this.device.reportError(new Error(`${this} creation failed:\n"${error.message}"`), this)();
63
+ this.device.debug();
64
+ });
65
+ this.handle.label = this.props.id;
66
+ log.groupCollapsed(3, `new WebGPURenderPass(${this.id})`)();
67
+ log.probe(3, JSON.stringify(renderPassDescriptor, null, 2))();
68
+ log.groupEnd(3)();
28
69
  }
29
- if (!device.commandEncoder) {
30
- throw new Error('commandEncoder not available');
70
+ finally {
71
+ if (profiler) {
72
+ profiler.renderPassSetupCount = (profiler.renderPassSetupCount || 0) + 1;
73
+ profiler.renderPassSetupTimeMs =
74
+ (profiler.renderPassSetupTimeMs || 0) + (getTimestamp() - startTime);
75
+ }
31
76
  }
32
- this.device.pushErrorScope('validation');
33
- this.handle =
34
- this.props.handle || device.commandEncoder.handle.beginRenderPass(renderPassDescriptor);
35
- this.device.popErrorScope((error) => {
36
- this.device.reportError(new Error(`${this} creation failed:\n"${error.message}"`), this)();
37
- this.device.debug();
38
- });
39
- this.handle.label = this.props.id;
40
- log.groupCollapsed(3, `new WebGPURenderPass(${this.id})`)();
41
- log.probe(3, JSON.stringify(renderPassDescriptor, null, 2))();
42
- log.groupEnd(3)();
43
77
  }
44
- destroy() { }
78
+ destroy() {
79
+ this.destroyResource();
80
+ }
45
81
  end() {
82
+ if (this.destroyed) {
83
+ return;
84
+ }
46
85
  this.handle.end();
86
+ this.destroy();
47
87
  }
48
88
  setPipeline(pipeline) {
49
89
  this.pipeline = pipeline;
@@ -56,10 +96,14 @@ export class WebGPURenderPass extends RenderPass {
56
96
  }
57
97
  /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
58
98
  setBindings(bindings) {
59
- this.pipeline?.setBindings(bindings);
60
- const bindGroup = this.pipeline?._getBindGroup();
61
- if (bindGroup) {
62
- this.handle.setBindGroup(0, bindGroup);
99
+ this.bindings = bindings;
100
+ const bindGroups = (this.pipeline &&
101
+ _getDefaultBindGroupFactory(this.device).getBindGroups(this.pipeline, bindings)) ||
102
+ {};
103
+ for (const [group, bindGroup] of Object.entries(bindGroups)) {
104
+ if (bindGroup) {
105
+ this.handle.setBindGroup(Number(group), bindGroup);
106
+ }
63
107
  }
64
108
  }
65
109
  setIndexBuffer(buffer, indexFormat, offset = 0, size) {
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { Binding, RenderPass, VertexArray } from '@luma.gl/core';
1
+ import type { Bindings, BindingsByGroup, RenderPass, VertexArray } from '@luma.gl/core';
2
2
  import { RenderPipeline, RenderPipelineProps } from '@luma.gl/core';
3
3
  import type { WebGPUDevice } from "../webgpu-device.js";
4
4
  import type { WebGPUShader } from "./webgpu-shader.js";
@@ -6,20 +6,20 @@ import type { WebGPUShader } from "./webgpu-shader.js";
6
6
  export declare class WebGPURenderPipeline extends RenderPipeline {
7
7
  readonly device: WebGPUDevice;
8
8
  readonly handle: GPURenderPipeline;
9
+ readonly descriptor: GPURenderPipelineDescriptor | null;
9
10
  readonly vs: WebGPUShader;
10
11
  readonly fs: WebGPUShader | null;
11
- /** For internal use to create BindGroups */
12
- private _bindings;
13
- private _bindGroupLayout;
14
- private _bindGroup;
12
+ /** Compatibility path for direct pipeline.setBindings() usage */
13
+ private _bindingsByGroup;
14
+ private _bindGroupCacheKeysByGroup;
15
15
  get [Symbol.toStringTag](): string;
16
16
  constructor(device: WebGPUDevice, props: RenderPipelineProps);
17
17
  destroy(): void;
18
18
  /**
19
- * @todo Use renderpass.setBindings() ?
20
- * @todo Do we want to expose BindGroups in the API and remove this?
19
+ * Compatibility shim for code paths that still set bindings on the pipeline.
20
+ * The shared-model path passes bindings per draw and does not rely on this state.
21
21
  */
22
- setBindings(bindings: Record<string, Binding>): void;
22
+ setBindings(bindings: Bindings | BindingsByGroup): void;
23
23
  /** @todo - should this be moved to renderpass? */
24
24
  draw(options: {
25
25
  renderPass: RenderPass;
@@ -31,9 +31,13 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
31
31
  firstIndex?: number;
32
32
  firstInstance?: number;
33
33
  baseVertex?: number;
34
+ bindings?: Bindings;
35
+ bindGroups?: BindingsByGroup;
36
+ _bindGroupCacheKeys?: Partial<Record<number, object>>;
37
+ uniforms?: Record<string, unknown>;
34
38
  }): boolean;
35
- /** Return a bind group created by setBindings */
36
- _getBindGroup(): GPUBindGroup | null;
39
+ _getBindingsByGroupWebGPU(): BindingsByGroup;
40
+ _getBindGroupCacheKeysWebGPU(): Partial<Record<number, object>>;
37
41
  /**
38
42
  * Populate the complex WebGPU GPURenderPipelineDescriptor
39
43
  */