@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
@@ -1 +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,WAAW,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAM,MAAM,eAAe,CAAC;AASvE,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAKlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,4CAA4C;IAC5C,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IA0BnD,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAUpD,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,WAAW,CAAC;QACzB,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,OAAO;IA4CX,iDAAiD;IACjD,aAAa;IAiBb;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAsDvC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
1
+ {"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACtF,OAAO,EACL,cAAc,EACd,mBAAmB,EAIpB,MAAM,eAAe,CAAC;AAOvB,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAKlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,iEAAiE;IACjE,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,0BAA0B,CAAuC;IAEzE,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAmCnD,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAoBvD,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,WAAW,CAAC;QACzB,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;QACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,GAAG,OAAO;IA2DX,yBAAyB,IAAI,eAAe;IAI5C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAI/D;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAwDvC;AAaD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
@@ -1,44 +1,53 @@
1
1
  // luma.gl MIT license
2
- import { RenderPipeline, log } from '@luma.gl/core';
2
+ import { RenderPipeline, _getDefaultBindGroupFactory, log, normalizeBindingsByGroup } from '@luma.gl/core';
3
3
  import { applyParametersToRenderPipelineDescriptor } from "../helpers/webgpu-parameters.js";
4
4
  import { getWebGPUTextureFormat } from "../helpers/convert-texture-format.js";
5
- import { getBindGroup } from "../helpers/get-bind-group.js";
6
5
  import { getVertexBufferLayout } from "../helpers/get-vertex-buffer-layout.js";
7
6
  // RENDER PIPELINE
8
7
  /** Creates a new render pipeline when parameters change */
9
8
  export class WebGPURenderPipeline extends RenderPipeline {
10
9
  device;
11
10
  handle;
11
+ descriptor;
12
12
  vs;
13
13
  fs = null;
14
- /** For internal use to create BindGroups */
15
- _bindings;
16
- _bindGroupLayout = null;
17
- _bindGroup = null;
14
+ /** Compatibility path for direct pipeline.setBindings() usage */
15
+ _bindingsByGroup;
16
+ _bindGroupCacheKeysByGroup = {};
18
17
  get [Symbol.toStringTag]() {
19
18
  return 'WebGPURenderPipeline';
20
19
  }
21
20
  constructor(device, props) {
22
21
  super(device, props);
23
22
  this.device = device;
23
+ this.shaderLayout ||= this.device.getShaderLayout(props.vs.source) || {
24
+ attributes: [],
25
+ bindings: []
26
+ };
24
27
  this.handle = this.props.handle;
28
+ let descriptor = null;
25
29
  if (!this.handle) {
26
- const descriptor = this._getRenderPipelineDescriptor();
30
+ descriptor = this._getRenderPipelineDescriptor();
27
31
  log.groupCollapsed(1, `new WebGPURenderPipeline(${this.id})`)();
28
32
  log.probe(1, JSON.stringify(descriptor, null, 2))();
29
33
  log.groupEnd(1)();
30
34
  this.device.pushErrorScope('validation');
31
35
  this.handle = this.device.handle.createRenderPipeline(descriptor);
32
36
  this.device.popErrorScope((error) => {
37
+ this.linkStatus = 'error';
33
38
  this.device.reportError(new Error(`${this} creation failed:\n"${error.message}"`), this)();
34
39
  this.device.debug();
35
40
  });
36
41
  }
42
+ this.descriptor = descriptor;
37
43
  this.handle.label = this.props.id;
44
+ this.linkStatus = 'success';
38
45
  // Note: Often the same shader in WebGPU
39
46
  this.vs = props.vs;
40
47
  this.fs = props.fs;
41
- this._bindings = { ...this.props.bindings };
48
+ this._bindingsByGroup =
49
+ props.bindGroups || normalizeBindingsByGroup(this.shaderLayout, props.bindings);
50
+ this._bindGroupCacheKeysByGroup = createBindGroupCacheKeys(this._bindingsByGroup);
42
51
  }
43
52
  destroy() {
44
53
  // WebGPURenderPipeline has no destroy method.
@@ -46,21 +55,34 @@ export class WebGPURenderPipeline extends RenderPipeline {
46
55
  this.handle = null;
47
56
  }
48
57
  /**
49
- * @todo Use renderpass.setBindings() ?
50
- * @todo Do we want to expose BindGroups in the API and remove this?
58
+ * Compatibility shim for code paths that still set bindings on the pipeline.
59
+ * The shared-model path passes bindings per draw and does not rely on this state.
51
60
  */
52
61
  setBindings(bindings) {
53
- // Invalidate the cached bind group if any value has changed
54
- for (const [name, binding] of Object.entries(bindings)) {
55
- if (this._bindings[name] !== binding) {
56
- this._bindGroup = null;
62
+ const nextBindingsByGroup = normalizeBindingsByGroup(this.shaderLayout, bindings);
63
+ for (const [groupKey, groupBindings] of Object.entries(nextBindingsByGroup)) {
64
+ const group = Number(groupKey);
65
+ for (const [name, binding] of Object.entries(groupBindings || {})) {
66
+ const currentGroupBindings = this._bindingsByGroup[group] || {};
67
+ if (currentGroupBindings[name] !== binding) {
68
+ if (!this._bindingsByGroup[group] ||
69
+ this._bindingsByGroup[group] === currentGroupBindings) {
70
+ this._bindingsByGroup[group] = { ...currentGroupBindings };
71
+ }
72
+ this._bindingsByGroup[group][name] = binding;
73
+ this._bindGroupCacheKeysByGroup[group] = {};
74
+ }
57
75
  }
58
76
  }
59
- Object.assign(this._bindings, bindings);
60
77
  }
61
78
  /** @todo - should this be moved to renderpass? */
62
79
  draw(options) {
80
+ if (this.isErrored) {
81
+ log.info(2, `RenderPipeline:${this.id}.draw() aborted - pipeline initialization failed`)();
82
+ return false;
83
+ }
63
84
  const webgpuRenderPass = options.renderPass;
85
+ const instanceCount = options.instanceCount && options.instanceCount > 0 ? options.instanceCount : 1;
64
86
  // Set pipeline
65
87
  this.device.pushErrorScope('validation');
66
88
  webgpuRenderPass.handle.setPipeline(this.handle);
@@ -69,38 +91,32 @@ export class WebGPURenderPipeline extends RenderPipeline {
69
91
  this.device.debug();
70
92
  });
71
93
  // Set bindings (uniform buffers, textures etc)
72
- const bindGroup = this._getBindGroup();
73
- if (bindGroup) {
74
- webgpuRenderPass.handle.setBindGroup(0, bindGroup);
94
+ const hasExplicitBindings = Boolean(options.bindGroups || options.bindings);
95
+ const bindGroups = _getDefaultBindGroupFactory(this.device).getBindGroups(this, hasExplicitBindings ? options.bindGroups || options.bindings : this._bindingsByGroup, hasExplicitBindings ? options._bindGroupCacheKeys : this._bindGroupCacheKeysByGroup);
96
+ for (const [group, bindGroup] of Object.entries(bindGroups)) {
97
+ if (bindGroup) {
98
+ webgpuRenderPass.handle.setBindGroup(Number(group), bindGroup);
99
+ }
75
100
  }
76
101
  // Set attributes
77
102
  // Note: Rebinds constant attributes before each draw call
78
103
  options.vertexArray.bindBeforeRender(options.renderPass);
79
104
  // Draw
80
105
  if (options.indexCount) {
81
- webgpuRenderPass.handle.drawIndexed(options.indexCount, options.instanceCount, options.firstIndex, options.baseVertex, options.firstInstance);
106
+ webgpuRenderPass.handle.drawIndexed(options.indexCount, instanceCount, options.firstIndex || 0, options.baseVertex || 0, options.firstInstance || 0);
82
107
  }
83
108
  else {
84
- webgpuRenderPass.handle.draw(options.vertexCount || 0, options.instanceCount || 1, // If 0, nothing will be drawn
85
- options.firstInstance);
109
+ webgpuRenderPass.handle.draw(options.vertexCount || 0, instanceCount, options.firstVertex || 0, options.firstInstance || 0);
86
110
  }
87
111
  // Note: Rebinds constant attributes before each draw call
88
112
  options.vertexArray.unbindAfterRender(options.renderPass);
89
113
  return true;
90
114
  }
91
- /** Return a bind group created by setBindings */
92
- _getBindGroup() {
93
- if (this.shaderLayout.bindings.length === 0) {
94
- return null;
95
- }
96
- // Get hold of the bind group layout. We don't want to do this unless we know there is at least one bind group
97
- this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);
98
- // Set up the bindings
99
- // TODO what if bindings change? We need to rebuild the bind group!
100
- this._bindGroup =
101
- this._bindGroup ||
102
- getBindGroup(this.device.handle, this._bindGroupLayout, this.shaderLayout, this._bindings);
103
- return this._bindGroup;
115
+ _getBindingsByGroupWebGPU() {
116
+ return this._bindingsByGroup;
117
+ }
118
+ _getBindGroupCacheKeysWebGPU() {
119
+ return this._bindGroupCacheKeysByGroup;
104
120
  }
105
121
  /**
106
122
  * Populate the complex WebGPU GPURenderPipelineDescriptor
@@ -110,7 +126,9 @@ export class WebGPURenderPipeline extends RenderPipeline {
110
126
  const vertex = {
111
127
  module: this.props.vs.handle,
112
128
  entryPoint: this.props.vertexEntryPoint || 'main',
113
- buffers: getVertexBufferLayout(this.shaderLayout, this.props.bufferLayout)
129
+ buffers: getVertexBufferLayout(this.shaderLayout, this.props.bufferLayout, {
130
+ pipelineId: this.id
131
+ })
114
132
  };
115
133
  // Populate color targets
116
134
  // TODO - at the moment blend and write mask are only set on the first target
@@ -153,6 +171,15 @@ export class WebGPURenderPipeline extends RenderPipeline {
153
171
  return descriptor;
154
172
  }
155
173
  }
174
+ function createBindGroupCacheKeys(bindingsByGroup) {
175
+ const bindGroupCacheKeys = {};
176
+ for (const [groupKey, groupBindings] of Object.entries(bindingsByGroup)) {
177
+ if (groupBindings && Object.keys(groupBindings).length > 0) {
178
+ bindGroupCacheKeys[Number(groupKey)] = {};
179
+ }
180
+ }
181
+ return bindGroupCacheKeys;
182
+ }
156
183
  /**
157
184
  _setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {
158
185
  if (this._indexBuffer) {
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-render-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAGtB,OAAO,EAAC,cAAc,EAAuB,GAAG,EAAC,MAAM,eAAe,CAAC;AACvE,OAAO,EAAC,yCAAyC,EAAC,wCAAqC;AACvF,OAAO,EAAC,sBAAsB,EAAC,6CAA0C;AACzE,OAAO,EAAC,YAAY,EAAC,qCAAkC;AACvD,OAAO,EAAC,qBAAqB,EAAC,+CAA4C;AAU1E,kBAAkB;AAElB,2DAA2D;AAC3D,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IAC7C,MAAM,CAAe;IACrB,MAAM,CAAoB;IAE1B,EAAE,CAAe;IACjB,EAAE,GAAwB,IAAI,CAAC;IAExC,4CAA4C;IACpC,SAAS,CAA0B;IACnC,gBAAgB,GAA8B,IAAI,CAAC;IACnD,UAAU,GAAwB,IAAI,CAAC;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,YAAY,MAAoB,EAAE,KAA0B;QAC1D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAA2B,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,UAAU,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACvD,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,4BAA4B,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAElB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAElC,wCAAwC;QACxC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;QACnC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;QAEnC,IAAI,CAAC,SAAS,GAAG,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC;IAC5C,CAAC;IAEQ,OAAO;QACd,8CAA8C;QAC9C,mBAAmB;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,QAAiC;QAC3C,4DAA4D;QAC5D,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC;QACH,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,kDAAkD;IAClD,IAAI,CAAC,OAUJ;QACC,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAA8B,CAAC;QAEhE,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,0BAA0B,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,+CAA+C;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACvC,IAAI,SAAS,EAAE,CAAC;YACd,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,iBAAiB;QACjB,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzD,OAAO;QACP,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,gBAAgB,CAAC,MAAM,CAAC,WAAW,CACjC,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,CACtB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAC1B,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,OAAO,CAAC,aAAa,IAAI,CAAC,EAAE,8BAA8B;YAC1D,OAAO,CAAC,aAAa,CACtB,CAAC;QACJ,CAAC;QAED,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iDAAiD;IACjD,aAAa;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,8GAA8G;QAC9G,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEnF,sBAAsB;QACtB,mEAAmE;QACnE,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU;gBACf,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAE7F,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACO,4BAA4B;QACpC,0BAA0B;QAC1B,MAAM,MAAM,GAAmB;YAC7B,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,MAAM;YACjD,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SAC3E,CAAC;QAEF,yBAAyB;QACzB,6EAA6E;QAC7E,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACtC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;gBACvD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAC,CAAC,CAAC;QACnF,CAAC;QAED,4BAA4B;QAC5B,MAAM,QAAQ,GAAqB;YACjC,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,MAAM;YACnD,OAAO;SACR,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAC9C,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,MAAM,UAAU,GAAgC;YAC9C,MAAM;YACN,QAAQ;YACR,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;aAC9B;YACD,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,yEAAyE;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAEhG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;YAC5C,UAAU,CAAC,YAAY,GAAG;gBACxB,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC;aAC5C,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,yCAAyC,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE7E,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
1
+ {"version":3,"file":"webgpu-render-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAGtB,OAAO,EACL,cAAc,EAEd,2BAA2B,EAC3B,GAAG,EACH,wBAAwB,EACzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,yCAAyC,EAAC,wCAAqC;AACvF,OAAO,EAAC,sBAAsB,EAAC,6CAA0C;AACzE,OAAO,EAAC,qBAAqB,EAAC,+CAA4C;AAS1E,kBAAkB;AAElB,2DAA2D;AAC3D,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IAC7C,MAAM,CAAe;IACrB,MAAM,CAAoB;IAC1B,UAAU,CAAqC;IAE/C,EAAE,CAAe;IACjB,EAAE,GAAwB,IAAI,CAAC;IAExC,iEAAiE;IACzD,gBAAgB,CAAkB;IAClC,0BAA0B,GAAoC,EAAE,CAAC;IAEzE,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,YAAY,MAAoB,EAAE,KAA0B;QAC1D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,MAAM,CAAC,eAAe,CAAE,KAAK,CAAC,EAAmB,CAAC,MAAM,CAAC,IAAI;YACtF,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,EAAE;SACb,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAA2B,CAAC;QACrD,IAAI,UAAU,GAAuC,IAAI,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,UAAU,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACjD,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,4BAA4B,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAElB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;gBAC5C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,wCAAwC;QACxC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;QACnC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAkB,CAAC;QACnC,IAAI,CAAC,gBAAgB;YACnB,KAAK,CAAC,UAAU,IAAI,wBAAwB,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,0BAA0B,GAAG,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACpF,CAAC;IAEQ,OAAO;QACd,8CAA8C;QAC9C,mBAAmB;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,QAAoC;QAC9C,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAClF,KAAK,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,CAAC;gBAClE,MAAM,oBAAoB,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChE,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;oBAC3C,IACE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;wBAC7B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,oBAAoB,EACrD,CAAC;wBACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,EAAC,GAAG,oBAAoB,EAAC,CAAC;oBAC3D,CAAC;oBACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;oBAC7C,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC9C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,IAAI,CAAC,OAcJ;QACC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,kBAAkB,IAAI,CAAC,EAAE,kDAAkD,CAAC,EAAE,CAAC;YAC3F,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAA8B,CAAC;QAChE,MAAM,aAAa,GACjB,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjF,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,GAAG,IAAI,0BAA0B,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,+CAA+C;QAC/C,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CACvE,IAAI,EACJ,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EACpF,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,0BAA0B,CACpF,CAAC;QACF,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5D,IAAI,SAAS,EAAE,CAAC;gBACd,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAyB,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzD,OAAO;QACP,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,gBAAgB,CAAC,MAAM,CAAC,WAAW,CACjC,OAAO,CAAC,UAAU,EAClB,aAAa,EACb,OAAO,CAAC,UAAU,IAAI,CAAC,EACvB,OAAO,CAAC,UAAU,IAAI,CAAC,EACvB,OAAO,CAAC,aAAa,IAAI,CAAC,CAC3B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAC1B,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,aAAa,EACb,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,OAAO,CAAC,aAAa,IAAI,CAAC,CAC3B,CAAC;QACJ,CAAC;QAED,0DAA0D;QAC1D,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yBAAyB;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,4BAA4B;QAC1B,OAAO,IAAI,CAAC,0BAA0B,CAAC;IACzC,CAAC;IAED;;OAEG;IACO,4BAA4B;QACpC,0BAA0B;QAC1B,MAAM,MAAM,GAAmB;YAC7B,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,MAAM;YACjD,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;gBACzE,UAAU,EAAE,IAAI,CAAC,EAAE;aACpB,CAAC;SACH,CAAC;QAEF,yBAAyB;QACzB,6EAA6E;QAC7E,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACtC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;gBACvD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAC,CAAC,CAAC;QACnF,CAAC;QAED,4BAA4B;QAC5B,MAAM,QAAQ,GAAqB;YACjC,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAmB,CAAC,MAAM;YAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,MAAM;YACnD,OAAO;SACR,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAC9C,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,MAAM,UAAU,GAAgC;YAC9C,MAAM;YACN,QAAQ;YACR,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;aAC9B;YACD,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,yEAAyE;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAEhG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;YAC5C,UAAU,CAAC,YAAY,GAAG;gBACxB,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC;aAC5C,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,yCAAyC,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE7E,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAED,SAAS,wBAAwB,CAC/B,eAAgC;IAEhC,MAAM,kBAAkB,GAAoC,EAAE,CAAC;IAC/D,KAAK,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QACxE,IAAI,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3D,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAwBlD,OAAO,IAAI,IAAI;CAMzB"}
1
+ {"version":3,"file":"webgpu-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAEhB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB;IAwBlD,OAAO,IAAI,IAAI;CAWzB"}
@@ -27,6 +27,10 @@ export class WebGPUSampler extends Sampler {
27
27
  this.handle.label = this.props.id;
28
28
  }
29
29
  destroy() {
30
+ if (this.destroyed) {
31
+ return;
32
+ }
33
+ this.destroyResource();
30
34
  // GPUSampler does not have a destroy method
31
35
  // this.handle.destroy();
32
36
  // @ts-expect-error readonly
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-sampler.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,oCAAoC;AAEpC,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAOpD;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAO;IAC/B,MAAM,CAAe;IACrB,MAAM,CAAa;IAE5B,YAAY,MAAoB,EAAE,KAAyB;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,0CAA0C;QAC1C,MAAM,iBAAiB,GAAkC;YACvD,GAAG,IAAI,CAAC,KAAK;YACb,YAAY,EAAE,SAAS;SACxB,CAAC;QAEF,mEAAmE;QACnE,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACxC,OAAO,iBAAiB,CAAC,OAAO,CAAC;QACnC,CAAC;QAED,kCAAkC;QAClC,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACxD,iBAAiB,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,4CAA4C;QAC5C,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
1
+ {"version":3,"file":"webgpu-sampler.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-sampler.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,oCAAoC;AAEpC,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAOpD;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAO;IAC/B,MAAM,CAAe;IACrB,MAAM,CAAa;IAE5B,YAAY,MAAoB,EAAE,KAAyB;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,0CAA0C;QAC1C,MAAM,iBAAiB,GAAkC;YACvD,GAAG,IAAI,CAAC,KAAK;YACb,YAAY,EAAE,SAAS;SACxB,CAAC;QAEF,mEAAmE;QACnE,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACxC,OAAO,iBAAiB,CAAC,OAAO,CAAC;QACnC,CAAC;QAED,kCAAkC;QAClC,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACxD,iBAAiB,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,4CAA4C;QAC5C,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD;;GAEG;AACH,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IAwBpD,IAAI,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,CAEzC;IAEK,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,OAAO,IAAI,IAAI;IAOxB,+CAA+C;IACzC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAIhE"}
1
+ {"version":3,"file":"webgpu-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD;;GAEG;AACH,qBAAa,YAAa,SAAQ,MAAM;IACtC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;gBAErB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IAwBpD,IAAI,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,CAEzC;IAEK,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,OAAO,IAAI,IAAI;IAOxB,+CAA+C;IACzC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;CAmBhE"}
@@ -47,7 +47,23 @@ export class WebGPUShader extends Shader {
47
47
  }
48
48
  /** Returns compilation info for this shader */
49
49
  async getCompilationInfo() {
50
- const compilationInfo = await this.handle.getCompilationInfo();
50
+ // `_checkCompilationError()` runs asynchronously after construction, so the shader can be
51
+ // destroyed before we await compilation info. Snapshot the handle and treat a destroyed shader
52
+ // as having no compiler messages instead of dereferencing `null`.
53
+ const handle = this.handle;
54
+ if (!handle) {
55
+ return [];
56
+ }
57
+ let compilationInfo;
58
+ try {
59
+ compilationInfo = await handle.getCompilationInfo();
60
+ }
61
+ catch (error) {
62
+ if (this.device.shouldIgnoreDroppedInstanceError(error, 'getCompilationInfo')) {
63
+ return [];
64
+ }
65
+ throw error;
66
+ }
51
67
  return compilationInfo.messages;
52
68
  }
53
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-shader.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAGrC;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,MAAM;IAC7B,MAAM,CAAe;IACrB,MAAM,CAAkB;IAEjC,YAAY,MAAoB,EAAE,KAAkB;QAClD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CACrB,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,CAAC,OAAO,GAAG,CAAC,EACzD,IAAI,EACJ,IAAI,CAAC,KAAK,CAAC,MAAM,CAClB,EAAE,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,sBAAsB;QACxB,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,IAAI,IAAI,CAAC,iBAAiB,KAAK,OAAO,EAAE,CAAC;YACvC,2FAA2F;YAC3F,yEAAyE;YACzE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;YAClF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IAEQ,OAAO;QACd,0DAA0D;QAC1D,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,kBAAkB;QACtB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC;IAClC,CAAC;CACF"}
1
+ {"version":3,"file":"webgpu-shader.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-shader.ts"],"names":[],"mappings":"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"}
@@ -15,5 +15,11 @@ export declare class WebGPUTextureView extends TextureView {
15
15
  texture: WebGPUTexture;
16
16
  });
17
17
  destroy(): void;
18
+ /**
19
+ * Internal-only hook for the cached CanvasContext/PresentationContext swapchain path.
20
+ * Rebuilds the default view when the per-frame canvas texture handle changes, without
21
+ * replacing the long-lived luma.gl wrapper object.
22
+ */
23
+ _reinitialize(texture: WebGPUTexture): void;
18
24
  }
19
25
  //# sourceMappingURL=webgpu-texture-view.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,KAAK,EAAC,aAAa,EAAC,4BAAyB;AAiBpD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;gBAEpB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG;QAAC,OAAO,EAAE,aAAa,CAAA;KAAC;IAyBjF,OAAO,IAAI,IAAI;CAMzB"}
1
+ {"version":3,"file":"webgpu-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,KAAK,EAAC,aAAa,EAAC,4BAAyB;AAkBpD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;gBAEpB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG;QAAC,OAAO,EAAE,aAAa,CAAA;KAAC;IAuBjF,OAAO,IAAI,IAAI;IAYxB;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CA8B5C"}
@@ -2,6 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
  import { TextureView } from '@luma.gl/core';
5
+ import { getCpuHotspotProfiler, getTimestamp } from "../helpers/cpu-hotspot-profiler.js";
5
6
  /**
6
7
  *
7
8
  */
@@ -14,17 +15,15 @@ export class WebGPUTextureView extends TextureView {
14
15
  this.device = device;
15
16
  this.texture = props.texture;
16
17
  this.device.pushErrorScope('validation');
17
- this.handle =
18
- // props.handle ||
19
- this.texture.handle.createView({
20
- format: (this.props.format || this.texture.format),
21
- dimension: this.props.dimension || this.texture.dimension,
22
- aspect: this.props.aspect,
23
- baseMipLevel: this.props.baseMipLevel,
24
- mipLevelCount: this.props.mipLevelCount,
25
- baseArrayLayer: this.props.baseArrayLayer,
26
- arrayLayerCount: this.props.arrayLayerCount
27
- });
18
+ this.handle = this.texture.handle.createView({
19
+ format: (this.props.format || this.texture.format),
20
+ dimension: this.props.dimension || this.texture.dimension,
21
+ aspect: this.props.aspect,
22
+ baseMipLevel: this.props.baseMipLevel,
23
+ mipLevelCount: this.props.mipLevelCount,
24
+ baseArrayLayer: this.props.baseArrayLayer,
25
+ arrayLayerCount: this.props.arrayLayerCount
26
+ });
28
27
  this.device.popErrorScope((error) => {
29
28
  this.device.reportError(new Error(`TextureView constructor: ${error.message}`), this)();
30
29
  this.device.debug();
@@ -32,10 +31,47 @@ export class WebGPUTextureView extends TextureView {
32
31
  this.handle.label = this.props.id;
33
32
  }
34
33
  destroy() {
34
+ if (this.destroyed) {
35
+ return;
36
+ }
37
+ this.destroyResource();
35
38
  // GPUTextureView does not have a destroy method
36
39
  // this.handle.destroy();
37
40
  // @ts-expect-error readonly
38
41
  this.handle = null;
39
42
  }
43
+ /**
44
+ * Internal-only hook for the cached CanvasContext/PresentationContext swapchain path.
45
+ * Rebuilds the default view when the per-frame canvas texture handle changes, without
46
+ * replacing the long-lived luma.gl wrapper object.
47
+ */
48
+ _reinitialize(texture) {
49
+ // @ts-expect-error readonly
50
+ this.texture = texture;
51
+ const profiler = getCpuHotspotProfiler(this.device);
52
+ this.device.pushErrorScope('validation');
53
+ const createViewStartTime = profiler ? getTimestamp() : 0;
54
+ const handle = this.texture.handle.createView({
55
+ format: (this.props.format || this.texture.format),
56
+ dimension: this.props.dimension || this.texture.dimension,
57
+ aspect: this.props.aspect,
58
+ baseMipLevel: this.props.baseMipLevel,
59
+ mipLevelCount: this.props.mipLevelCount,
60
+ baseArrayLayer: this.props.baseArrayLayer,
61
+ arrayLayerCount: this.props.arrayLayerCount
62
+ });
63
+ if (profiler) {
64
+ profiler.textureViewReinitializeCount = (profiler.textureViewReinitializeCount || 0) + 1;
65
+ profiler.textureViewReinitializeTimeMs =
66
+ (profiler.textureViewReinitializeTimeMs || 0) + (getTimestamp() - createViewStartTime);
67
+ }
68
+ this.device.popErrorScope((error) => {
69
+ this.device.reportError(new Error(`TextureView constructor: ${error.message}`), this)();
70
+ this.device.debug();
71
+ });
72
+ handle.label = this.props.id;
73
+ // @ts-expect-error readonly
74
+ this.handle = handle;
75
+ }
40
76
  }
41
77
  //# sourceMappingURL=webgpu-texture-view.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-texture-view.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,WAAW,EAAmB,MAAM,eAAe,CAAC;AAuB5D;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACvC,MAAM,CAAe;IACrB,MAAM,CAAiB;IACvB,OAAO,CAAgB;IAEhC,YAAY,MAAoB,EAAE,KAAwD;QACxF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM;YACT,kBAAkB;YAClB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC7B,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAqB;gBACtE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS;gBACzD,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBACzB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;gBACvC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;gBACzC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;aAC5C,CAAC,CAAC;QACL,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAe,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YACxF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;IAEQ,OAAO;QACd,gDAAgD;QAChD,yBAAyB;QACzB,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
1
+ {"version":3,"file":"webgpu-texture-view.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture-view.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,43 @@
1
- import type { TextureProps, TextureViewProps, CopyExternalImageOptions, CopyImageDataOptions } from '@luma.gl/core';
2
- import { Texture } from '@luma.gl/core';
1
+ import { type TextureProps, type TextureViewProps, type CopyExternalImageOptions, type TextureReadOptions, type TextureWriteOptions, Buffer, Texture } from '@luma.gl/core';
3
2
  import type { WebGPUDevice } from "../webgpu-device.js";
4
3
  import { WebGPUSampler } from "./webgpu-sampler.js";
5
4
  import { WebGPUTextureView } from "./webgpu-texture-view.js";
5
+ /** WebGPU implementation of the luma.gl core Texture resource */
6
6
  export declare class WebGPUTexture extends Texture {
7
7
  readonly device: WebGPUDevice;
8
8
  readonly handle: GPUTexture;
9
9
  sampler: WebGPUSampler;
10
10
  view: WebGPUTextureView;
11
+ private _allocatedByteLength;
11
12
  constructor(device: WebGPUDevice, props: TextureProps);
12
13
  destroy(): void;
13
14
  createView(props: TextureViewProps): WebGPUTextureView;
14
- copyImageData(options_: CopyImageDataOptions): void;
15
15
  copyExternalImage(options_: CopyExternalImageOptions): {
16
16
  width: number;
17
17
  height: number;
18
18
  };
19
19
  generateMipmapsWebGL(): void;
20
+ getImageDataLayout(options: TextureReadOptions): {
21
+ byteLength: number;
22
+ bytesPerRow: number;
23
+ rowsPerImage: number;
24
+ };
25
+ readBuffer(options?: TextureReadOptions & {
26
+ byteOffset?: number;
27
+ }, buffer?: Buffer): Buffer;
28
+ readDataAsync(options?: TextureReadOptions): Promise<ArrayBuffer>;
29
+ copyToBuffer(commandEncoder: GPUCommandEncoder, options: (TextureReadOptions & {
30
+ byteOffset?: number;
31
+ bytesPerRow?: number;
32
+ rowsPerImage?: number;
33
+ }) | undefined, buffer: Buffer): void;
34
+ writeBuffer(buffer: Buffer, options_?: TextureWriteOptions): void;
35
+ writeData(data: ArrayBuffer | SharedArrayBuffer | ArrayBufferView, options_?: TextureWriteOptions): void;
36
+ /**
37
+ * Internal-only hook for the cached CanvasContext/PresentationContext swapchain path.
38
+ * Rebinds this handle-backed texture wrapper to the current per-frame canvas texture
39
+ * without allocating a new luma.gl Texture or TextureView wrapper.
40
+ */
41
+ _reinitialize(handle: GPUTexture, props?: Partial<TextureProps>): void;
20
42
  }
21
43
  //# sourceMappingURL=webgpu-texture.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,wBAAwB,EACxB,oBAAoB,EAErB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,OAAO,EAAM,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,iBAAiB,EAAC,iCAA8B;AAExD,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,iBAAiB,CAAC;gBAEZ,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY;IA6D5C,OAAO,IAAI,IAAI;IAMxB,UAAU,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB;IAItD,aAAa,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IA+BnD,iBAAiB,CAAC,QAAQ,EAAE,wBAAwB,GAAG;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;IAgC7E,oBAAoB,IAAI,IAAI;CAwEtC"}
1
+ {"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAExB,MAAM,EACN,OAAO,EAGR,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AACnD,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,iBAAiB,EAAC,iCAA8B;AAGxD,iEAAiE;AACjE,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,CAAC,oBAAoB,CAAa;gBAE7B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY;IAuE5C,OAAO,IAAI,IAAI;IAiBxB,UAAU,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB;IAItD,iBAAiB,CAAC,QAAQ,EAAE,wBAAwB,GAAG;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;IAgC7E,oBAAoB,IAAI,IAAI;IAIrC,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG;QAC/C,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;KACtB;IAQQ,UAAU,CACjB,OAAO,GAAE,kBAAkB,GAAG;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAM,EACxD,MAAM,CAAC,EAAE,MAAM,GACd,MAAM;IAqCM,aAAa,CAAC,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAMpF,YAAY,CACV,cAAc,EAAE,iBAAiB,EACjC,OAAO,GAAE,kBAAkB,GAAG;QAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,aAAK,EACN,MAAM,EAAE,MAAM,GACb,IAAI;IAmCE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,mBAAwB;IA2C9D,SAAS,CAChB,IAAI,EAAE,WAAW,GAAG,iBAAiB,GAAG,eAAe,EACvD,QAAQ,GAAE,mBAAwB,GACjC,IAAI;IAgDP;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI;CAmDvE"}