@luma.gl/webgl 9.3.0-alpha.4 → 9.3.0-alpha.6

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 (68) hide show
  1. package/dist/adapter/converters/webgl-texture-table.d.ts +7 -1
  2. package/dist/adapter/converters/webgl-texture-table.d.ts.map +1 -1
  3. package/dist/adapter/converters/webgl-texture-table.js +121 -43
  4. package/dist/adapter/converters/webgl-texture-table.js.map +1 -1
  5. package/dist/adapter/device-helpers/webgl-device-features.d.ts.map +1 -1
  6. package/dist/adapter/device-helpers/webgl-device-features.js +1 -2
  7. package/dist/adapter/device-helpers/webgl-device-features.js.map +1 -1
  8. package/dist/adapter/device-helpers/webgl-device-info.js +5 -0
  9. package/dist/adapter/device-helpers/webgl-device-info.js.map +1 -1
  10. package/dist/adapter/helpers/get-shader-layout-from-glsl.js +16 -17
  11. package/dist/adapter/helpers/get-shader-layout-from-glsl.js.map +1 -1
  12. package/dist/adapter/resources/webgl-buffer.d.ts.map +1 -1
  13. package/dist/adapter/resources/webgl-buffer.js +19 -4
  14. package/dist/adapter/resources/webgl-buffer.js.map +1 -1
  15. package/dist/adapter/resources/webgl-command-buffer.d.ts +2 -2
  16. package/dist/adapter/resources/webgl-command-buffer.d.ts.map +1 -1
  17. package/dist/adapter/resources/webgl-command-buffer.js +2 -2
  18. package/dist/adapter/resources/webgl-command-buffer.js.map +1 -1
  19. package/dist/adapter/resources/webgl-command-encoder.d.ts +5 -4
  20. package/dist/adapter/resources/webgl-command-encoder.d.ts.map +1 -1
  21. package/dist/adapter/resources/webgl-command-encoder.js +20 -7
  22. package/dist/adapter/resources/webgl-command-encoder.js.map +1 -1
  23. package/dist/adapter/resources/webgl-query-set.d.ts +29 -31
  24. package/dist/adapter/resources/webgl-query-set.d.ts.map +1 -1
  25. package/dist/adapter/resources/webgl-query-set.js +193 -97
  26. package/dist/adapter/resources/webgl-query-set.js.map +1 -1
  27. package/dist/adapter/resources/webgl-render-pass.d.ts.map +1 -1
  28. package/dist/adapter/resources/webgl-render-pass.js +12 -0
  29. package/dist/adapter/resources/webgl-render-pass.js.map +1 -1
  30. package/dist/adapter/resources/webgl-render-pipeline.d.ts +13 -19
  31. package/dist/adapter/resources/webgl-render-pipeline.d.ts.map +1 -1
  32. package/dist/adapter/resources/webgl-render-pipeline.js +35 -152
  33. package/dist/adapter/resources/webgl-render-pipeline.js.map +1 -1
  34. package/dist/adapter/resources/webgl-shared-render-pipeline.d.ts +24 -0
  35. package/dist/adapter/resources/webgl-shared-render-pipeline.d.ts.map +1 -0
  36. package/dist/adapter/resources/webgl-shared-render-pipeline.js +152 -0
  37. package/dist/adapter/resources/webgl-shared-render-pipeline.js.map +1 -0
  38. package/dist/adapter/resources/webgl-texture.d.ts +23 -4
  39. package/dist/adapter/resources/webgl-texture.d.ts.map +1 -1
  40. package/dist/adapter/resources/webgl-texture.js +203 -100
  41. package/dist/adapter/resources/webgl-texture.js.map +1 -1
  42. package/dist/adapter/webgl-device.d.ts +4 -2
  43. package/dist/adapter/webgl-device.d.ts.map +1 -1
  44. package/dist/adapter/webgl-device.js +31 -3
  45. package/dist/adapter/webgl-device.js.map +1 -1
  46. package/dist/adapter/webgl-presentation-context.d.ts +21 -0
  47. package/dist/adapter/webgl-presentation-context.d.ts.map +1 -0
  48. package/dist/adapter/webgl-presentation-context.js +64 -0
  49. package/dist/adapter/webgl-presentation-context.js.map +1 -0
  50. package/dist/dist.dev.js +1332 -788
  51. package/dist/dist.min.js +2 -2
  52. package/dist/index.cjs +1247 -797
  53. package/dist/index.cjs.map +4 -4
  54. package/package.json +3 -3
  55. package/src/adapter/converters/webgl-texture-table.ts +159 -47
  56. package/src/adapter/device-helpers/webgl-device-features.ts +1 -2
  57. package/src/adapter/device-helpers/webgl-device-info.ts +6 -0
  58. package/src/adapter/helpers/get-shader-layout-from-glsl.ts +18 -19
  59. package/src/adapter/resources/webgl-buffer.ts +16 -4
  60. package/src/adapter/resources/webgl-command-buffer.ts +3 -2
  61. package/src/adapter/resources/webgl-command-encoder.ts +22 -7
  62. package/src/adapter/resources/webgl-query-set.ts +229 -102
  63. package/src/adapter/resources/webgl-render-pass.ts +13 -0
  64. package/src/adapter/resources/webgl-render-pipeline.ts +45 -179
  65. package/src/adapter/resources/webgl-shared-render-pipeline.ts +208 -0
  66. package/src/adapter/resources/webgl-texture.ts +326 -121
  67. package/src/adapter/webgl-device.ts +40 -4
  68. package/src/adapter/webgl-presentation-context.ts +93 -0
@@ -12,8 +12,8 @@ export class WEBGLCommandBuffer extends CommandBuffer {
12
12
  device;
13
13
  handle = null;
14
14
  commands = [];
15
- constructor(device) {
16
- super(device, {});
15
+ constructor(device, props = {}) {
16
+ super(device, props);
17
17
  this.device = device;
18
18
  }
19
19
  _executeCommands(commands = this.commands) {
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-command-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO;AAKL,4BAA4B;AAC5B,0BAA0B;AAC1B,aAAa,EACb,OAAO,EAEP,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,EAAE,EAAoD,MAAM,oBAAoB,CAAC;AAIzF,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,OAAO,EAAC,qBAAqB,EAAC,6CAA0C;AAwCxE,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IAC1C,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,GAAc,EAAE,CAAC;IAEzB,YAAY,MAAmB;QAC7B,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,gBAAgB,CAAC,WAAsB,IAAI,CAAC,QAAQ;QAClD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,KAAK,uBAAuB;oBAC1B,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;oBAClD,MAAM;gBACR,KAAK,wBAAwB;oBAC3B,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;oBACnD,MAAM;gBACR,KAAK,wBAAwB;oBAC3B,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;oBACnD,MAAM;gBACR,KAAK,yBAAyB;oBAC5B,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;oBACpD,MAAM;gBACR,wBAAwB;gBACxB,iDAAiD;gBACjD,WAAW;gBACX;oBACE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,SAAS,mBAAmB,CAAC,MAAmB,EAAE,OAAkC;IAClF,MAAM,MAAM,GAAG,OAAO,CAAC,YAA2B,CAAC;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAgC,CAAC;IAE7D,iDAAiD;IACjD,+FAA+F;IAC/F,MAAM,CAAC,EAAE,CAAC,UAAU,QAAsB,MAAM,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,CAAC,EAAE,CAAC,UAAU,QAAuB,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,CAAC,EAAE,CAAC,iBAAiB,eAGzB,OAAO,CAAC,YAAY,IAAI,CAAC,EACzB,OAAO,CAAC,iBAAiB,IAAI,CAAC,EAC9B,OAAO,CAAC,IAAI,CACb,CAAC;IACF,MAAM,CAAC,EAAE,CAAC,UAAU,QAAsB,IAAI,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,UAAU,QAAuB,IAAI,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,MAAmB,EAAE,OAAmC;IACpF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,MAAmB,EAAE,OAAmC;IACpF,MAAM;IACJ,+BAA+B;IAC/B,aAAa;IACb,iEAAiE;IACjE,QAAQ,GAAG,CAAC;IACZ,4DAA4D;IAC5D,MAAM,GAAG,KAAK;IAEd,oBAAoB;IACpB,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK;IACnC,qBAAqB;IACrB,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EACrC,kBAAkB,GAAG,CAAC;IACtB,qGAAqG;IACrG,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAElB,yBAAyB;IACzB,iBAAiB;IACjB,oGAAoG;IACpG,UAAU,GAAG,CAAC;IACd;;;OAGG;IACH,WAAW;IACX;;;;OAIG;IACH,YAAY,EACb,GAAG,OAAO,CAAC;IAEZ,mEAAmE;IACnE,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,iEAAiE;IACjE,IAAI,QAAQ,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;QAC9E,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,+DAA+D;IAC/D,MAAM,EAAC,WAAW,EAAE,kBAAkB,EAAC,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IACxE,IAAI,UAA+C,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,iBAAgC,CAAC;QACrD,MAAM,WAAW,GAAG,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC;QAClD,MAAM,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;QAExE,MAAM,YAAY,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClF,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;QACzC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;QAErC,iBAAiB;QACjB,0CAA0C;QAC1C,2DAA2D;QAC3D,iDAAiD;QACjD,yFAAyF;QACzF,gDAAgD;QAChD,IAAI;QAEJ,MAAM,CAAC,EAAE,CAAC,UAAU,QAAuB,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/D,6EAA6E;QAC7E,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,eAAe,QAAiB,WAAW,CAAC,MAAM,CAAC,CAAC;QAE3E,MAAM,CAAC,EAAE,CAAC,UAAU,CAClB,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,UAAU,CACX,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,EAAE,CAAC,UAAU,QAAuB,IAAI,CAAC,CAAC;QACjD,sEAAsE;QACtE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,CAAC,EAAE,CAAC,eAAe,QAAiB,UAAU,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,kBAAkB,EAAE,CAAC;YACvB,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AAEH;;GAEG;AACH,sDAAsD;AACtD,SAAS,qBAAqB,CAAC,MAAmB,EAAE,OAAoC;IACtF,MAAM;IACJ,+BAA+B;IAC/B,aAAa;IACb,2DAA2D;IAC3D,mBAAmB,GAAG,CAAC;IACvB,4DAA4D;IAC5D,kBAAkB;IAClB,kGAAkG;IAClG,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAEf,gGAAgG;IAChG,iBAAiB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE7B,+BAA+B;IAC/B,kBAAkB;IAClB,iEAAiE;IACjE,0CAA0C;IAC1C,qGAAqG;IACrG,8BAA8B;IAC9B,4DAA4D;IAC5D,sCAAsC;MACvC,GAAG,OAAO,CAAC;IAEZ,IAAI,EACF,KAAK,GAAG,OAAO,CAAC,kBAAkB,CAAC,KAAK,EACxC,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,MAAM;IAC1C,yBAAyB;MAC1B,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAC,WAAW,EAAE,kBAAkB,EAAC,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,CAAC,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;IAC1C,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC,GAAG,iBAAiB,CAAC;IAErE,6EAA6E;IAC7E,MAAM,UAAU,GAA4B,MAAM,CAAC,EAAE,CAAC,eAAe,QAEnE,WAAW,CAAC,MAAM,CACnB,CAAC;IACF,6CAA6C;IAC7C,gDAAgD;IAEhD,IAAI,OAAqB,CAAC;IAC1B,IAAI,aAAiB,CAAC;IACtB,IAAI,kBAAkB,YAAY,YAAY,EAAE,CAAC;QAC/C,OAAO,GAAG,kBAAkB,CAAC;QAC7B,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QACvD,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QAC3D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ,aAAa,EAAE,CAAC;QACtB,UAAmB;QACnB;YACE,MAAM,CAAC,EAAE,CAAC,iBAAiB,CACzB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,OAAO,EACP,KAAK,EACL,MAAM,CACP,CAAC;YACF,MAAM;QACR,WAAyB;QACzB;YACE,MAAM,CAAC,EAAE,CAAC,iBAAiB,CACzB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,OAAO,EACP,KAAK,EACL,MAAM,CACP,CAAC;YACF,MAAM;QACR,QAAQ;IACV,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,eAAe,QAAiB,UAAU,CAAC,CAAC;IACtD,IAAI,kBAAkB,EAAE,CAAC;QACvB,WAAW,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkCI;AAEJ,qFAAqF;AAErF,UAAU;AAEV;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAAyB,EACzB,SAAkE,EAClE,KAAa;IAEb,OAAO,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,QAAiC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClF,CAAC;AAED,8FAA8F;AAC9F,SAAS,cAAc,CAAC,MAA6B;IAInD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC9B,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAC,GAAG,MAAM,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAClD,EAAE,EAAE,mBAAmB,EAAE,EAAE;YAC3B,KAAK;YACL,MAAM;YACN,gBAAgB,EAAE,CAAC,MAAM,CAAC;SAC3B,CAAgC,CAAC;QAElC,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAE,IAAI,EAAC,CAAC;IACjD,CAAC;IACD,OAAO,EAAC,WAAW,EAAE,MAAqC,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;AACzF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAU;IAC7C,QAAQ,MAAM,EAAE,CAAC;QACf,UAAc;QACd,WAAa;QACb;YACE,OAAO,CAAC,CAAC;QACX,WAAc;QACd;YACE,OAAO,CAAC,CAAC;QACX,UAAY;QACZ;YACE,OAAO,CAAC,CAAC;QACX,UAAa;QACb;YACE,OAAO,CAAC,CAAC;QACX,kDAAkD;QAClD;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAQ;IACpC,QAAQ,IAAI,EAAE,CAAC;QACb;YACE,OAAO,CAAC,CAAC;QACX,WAA6B;QAC7B,WAA+B;QAC/B;YACE,OAAO,CAAC,CAAC;QACX;YACE,OAAO,CAAC,CAAC;QACX,gDAAgD;QAChD;YACE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"webgl-command-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { CommandEncoder, CommandEncoderProps } from '@luma.gl/core';
1
+ import { CommandBufferProps, CommandEncoder, CommandEncoderProps } from '@luma.gl/core';
2
2
  import type { RenderPassProps, ComputePass, ComputePassProps, QuerySet, Buffer, CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
3
3
  import { WEBGLCommandBuffer } from "./webgl-command-buffer.js";
4
4
  import { WEBGLRenderPass } from "./webgl-render-pass.js";
@@ -9,9 +9,9 @@ export declare class WEBGLCommandEncoder extends CommandEncoder {
9
9
  readonly commandBuffer: WEBGLCommandBuffer;
10
10
  constructor(device: WebGLDevice, props: CommandEncoderProps);
11
11
  destroy(): void;
12
- finish(): WEBGLCommandBuffer;
13
- beginRenderPass(props: RenderPassProps): WEBGLRenderPass;
14
- beginComputePass(props: ComputePassProps): ComputePass;
12
+ finish(props?: CommandBufferProps): WEBGLCommandBuffer;
13
+ beginRenderPass(props?: RenderPassProps): WEBGLRenderPass;
14
+ beginComputePass(props?: ComputePassProps): ComputePass;
15
15
  copyBufferToBuffer(options: CopyBufferToBufferOptions): void;
16
16
  copyBufferToTexture(options: CopyBufferToTextureOptions): void;
17
17
  copyTextureToBuffer(options: CopyTextureToBufferOptions): void;
@@ -24,5 +24,6 @@ export declare class WEBGLCommandEncoder extends CommandEncoder {
24
24
  queryCount?: number;
25
25
  destinationOffset?: number;
26
26
  }): void;
27
+ writeTimestamp(querySet: QuerySet, queryIndex: number): void;
27
28
  }
28
29
  //# sourceMappingURL=webgl-command-encoder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAG5B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AACpD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAE/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAMlD,OAAO,IAAI,IAAI;IAEf,MAAM,IAAI,kBAAkB;IAIrC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe;IAIxD,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,WAAW;IAItD,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAI5D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI9D,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI;IAQvD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa;IAEb,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,CACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GACA,IAAI;CACR"}
1
+ {"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACtF,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAG5B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AACpD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAG5C,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAE/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAQlD,OAAO,IAAI,IAAI;IAIf,MAAM,CAAC,KAAK,CAAC,EAAE,kBAAkB,GAAG,kBAAkB;IAS/D,eAAe,CAAC,KAAK,GAAE,eAAoB,GAAG,eAAe;IAI7D,gBAAgB,CAAC,KAAK,GAAE,gBAAqB,GAAG,WAAW;IAI3D,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAI5D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI9D,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI;IAQvD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa;IAEb,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,CACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GACA,IAAI;IAEP,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAI7D"}
@@ -11,16 +11,25 @@ export class WEBGLCommandEncoder extends CommandEncoder {
11
11
  constructor(device, props) {
12
12
  super(device, props);
13
13
  this.device = device;
14
- this.commandBuffer = new WEBGLCommandBuffer(device);
15
- }
16
- destroy() { }
17
- finish() {
14
+ this.commandBuffer = new WEBGLCommandBuffer(device, {
15
+ id: `${this.props.id}-command-buffer`
16
+ });
17
+ }
18
+ destroy() {
19
+ this.destroyResource();
20
+ }
21
+ finish(props) {
22
+ if (props?.id && this.commandBuffer.id !== props.id) {
23
+ this.commandBuffer.id = props.id;
24
+ this.commandBuffer.props.id = props.id;
25
+ }
26
+ this.destroy();
18
27
  return this.commandBuffer;
19
28
  }
20
- beginRenderPass(props) {
21
- return new WEBGLRenderPass(this.device, props);
29
+ beginRenderPass(props = {}) {
30
+ return new WEBGLRenderPass(this.device, this._applyTimeProfilingToPassProps(props));
22
31
  }
23
- beginComputePass(props) {
32
+ beginComputePass(props = {}) {
24
33
  throw new Error('ComputePass not supported in WebGL');
25
34
  }
26
35
  copyBufferToBuffer(options) {
@@ -42,5 +51,9 @@ export class WEBGLCommandEncoder extends CommandEncoder {
42
51
  popDebugGroup() { }
43
52
  insertDebugMarker(markerLabel) { }
44
53
  resolveQuerySet(querySet, destination, options) { }
54
+ writeTimestamp(querySet, queryIndex) {
55
+ const webglQuerySet = querySet;
56
+ webglQuerySet.writeTimestamp(queryIndex);
57
+ }
45
58
  }
46
59
  //# sourceMappingURL=webgl-command-encoder.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-command-encoder.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,cAAc,EAAsB,MAAM,eAAe,CAAC;AAelE,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AAGpD,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IAC5C,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IAEd,aAAa,CAAqB;IAE3C,YAAY,MAAmB,EAAE,KAA0B;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAEQ,OAAO,KAAU,CAAC;IAElB,MAAM;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,KAAsB;QACpC,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB,CAAC,KAAuB;QACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,OAAkC;QACnD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC7E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oBAAoB,CAAC,OAAoC;QACvD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC/E,CAAC;IAED,qDAAqD;IACrD,kFAAkF;IAClF,IAAI;IAEK,cAAc,CAAC,UAAkB,IAAS,CAAC;IAC3C,aAAa,KAAI,CAAC;IAElB,iBAAiB,CAAC,WAAmB,IAAS,CAAC;IAE/C,eAAe,CACtB,QAAkB,EAClB,WAAmB,EACnB,OAIC,IACM,CAAC;CACX"}
1
+ {"version":3,"file":"webgl-command-encoder.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAqB,cAAc,EAAsB,MAAM,eAAe,CAAC;AAetF,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AAIpD,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IAC5C,MAAM,CAAc;IACpB,MAAM,GAAG,IAAI,CAAC;IAEd,aAAa,CAAqB;IAE3C,YAAY,MAAmB,EAAE,KAA0B;QACzD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAClD,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,iBAAiB;SACtC,CAAC,CAAC;IACL,CAAC;IAEQ,OAAO;QACd,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEQ,MAAM,CAAC,KAA0B;QACxC,IAAI,KAAK,EAAE,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,QAAyB,EAAE;QACzC,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,gBAAgB,CAAC,QAA0B,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,OAAkC;QACnD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC7E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB,CAAC,OAAmC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oBAAoB,CAAC,OAAoC;QACvD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAC,CAAC,CAAC;IAC/E,CAAC;IAED,qDAAqD;IACrD,kFAAkF;IAClF,IAAI;IAEK,cAAc,CAAC,UAAkB,IAAS,CAAC;IAC3C,aAAa,KAAI,CAAC;IAElB,iBAAiB,CAAC,WAAmB,IAAS,CAAC;IAE/C,eAAe,CACtB,QAAkB,EAClB,WAAmB,EACnB,OAIC,IACM,CAAC;IAEV,cAAc,CAAC,QAAkB,EAAE,UAAkB;QACnD,MAAM,aAAa,GAAG,QAAyB,CAAC;QAChD,aAAa,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;CACF"}
@@ -1,44 +1,42 @@
1
1
  import { QuerySet, QuerySetProps } from '@luma.gl/core';
2
2
  import { WebGLDevice } from "../webgl-device.js";
3
+ type WebGLPendingQuery = {
4
+ handle: WebGLQuery;
5
+ promise: Promise<bigint> | null;
6
+ result: bigint | null;
7
+ disjoint: boolean;
8
+ };
9
+ type WebGLTimestampPair = {
10
+ activeQuery: WebGLPendingQuery | null;
11
+ completedQueries: WebGLPendingQuery[];
12
+ };
3
13
  /**
4
14
  * Asynchronous queries for different kinds of information
5
15
  */
6
16
  export declare class WEBGLQuerySet extends QuerySet {
7
17
  readonly device: WebGLDevice;
8
- readonly handle: WebGLQuery;
9
- target: number | null;
10
- _queryPending: boolean;
11
- _pollingPromise: Promise<any> | null;
18
+ readonly handle: WebGLQuery | null;
19
+ protected _timestampPairs: WebGLTimestampPair[];
20
+ protected _occlusionQuery: WebGLPendingQuery | null;
21
+ protected _occlusionActive: boolean;
12
22
  get [Symbol.toStringTag](): string;
13
23
  constructor(device: WebGLDevice, props: QuerySetProps);
14
24
  destroy(): void;
15
- /**
16
- * Shortcut for timer query (dependent on extension in both WebGL1 and 2)
17
- * Measures GPU time delta between this call and a matching `end` call in the
18
- * GPU instruction stream.
19
- */
20
- beginTimestampQuery(): void;
21
- endTimestampQuery(): void;
22
- beginOcclusionQuery(options?: {
23
- conservative?: boolean;
24
- }): void;
25
+ isResultAvailable(queryIndex?: number): boolean;
26
+ readResults(options?: {
27
+ firstQuery?: number;
28
+ queryCount?: number;
29
+ }): Promise<bigint[]>;
30
+ readTimestampDuration(beginIndex: number, endIndex: number): Promise<number>;
31
+ beginOcclusionQuery(): void;
25
32
  endOcclusionQuery(): void;
26
- beginTransformFeedbackQuery(): void;
27
- endTransformFeedbackQuery(): void;
28
- resolveQuery(): Promise<bigint[]>;
29
- /**
30
- * Due to OpenGL API limitations, after calling `begin()` on one Query
31
- * instance, `end()` must be called on that same instance before
32
- * calling `begin()` on another query. While there can be multiple
33
- * outstanding queries representing disjoint `begin()`/`end()` intervals.
34
- * It is not possible to interleave or overlap `begin` and `end` calls.
35
- */
36
- protected _begin(target: number): void;
37
- protected _end(): void;
38
- isResultAvailable(): boolean;
39
- isTimerDisjoint(): boolean;
40
- getResult(): any;
41
- getTimerMilliseconds(): number;
42
- pollQuery(limit?: number): Promise<any>;
33
+ writeTimestamp(queryIndex: number): void;
34
+ protected _validateRange(firstQuery: number, queryCount: number): void;
35
+ protected _getTimestampPairIndex(queryIndex: number): number;
36
+ protected _isTimestampPairAvailable(pairIndex: number): boolean;
37
+ protected _pollQueryAvailability(query: WebGLPendingQuery): boolean;
38
+ protected _consumeTimestampPairResult(pairIndex: number): Promise<bigint>;
39
+ protected _consumeQueryResult(query: WebGLPendingQuery): Promise<bigint>;
43
40
  }
41
+ export {};
44
42
  //# sourceMappingURL=webgl-query-set.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-query-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C;;GAEG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAE5B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7B,aAAa,UAAS;IACtB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE5C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAGW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa;IAgB5C,OAAO;IAMhB;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;IAI3B,iBAAiB,IAAI,IAAI;IAKzB,mBAAmB,CAAC,OAAO,CAAC,EAAE;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAM7D,iBAAiB;IAKjB,2BAA2B,IAAI,IAAI;IAInC,yBAAyB,IAAI,IAAI;IAI3B,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAOvC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAatC,SAAS,CAAC,IAAI,IAAI,IAAI;IAetB,iBAAiB,IAAI,OAAO;IAgB5B,eAAe,IAAI,OAAO;IAK1B,SAAS,IAAI,GAAG;IAKhB,oBAAoB;IAKpB,SAAS,CAAC,KAAK,GAAE,MAAiC,GAAG,OAAO,CAAC,GAAG,CAAC;CAyBlE"}
1
+ {"version":3,"file":"webgl-query-set.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-query-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAEnC,SAAS,CAAC,eAAe,EAAE,kBAAkB,EAAE,CAAM;IACrD,SAAS,CAAC,eAAe,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAC3D,SAAS,CAAC,gBAAgB,UAAS;IAEnC,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa;IA0B5C,OAAO,IAAI,IAAI;IAyBxB,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO;IAiBzC,WAAW,CAAC,OAAO,CAAC,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiCpF,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelF,mBAAmB,IAAI,IAAI;IAqB3B,iBAAiB,IAAI,IAAI;IASzB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAuCxC,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAMtE,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAQ5D,SAAS,CAAC,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAS/D,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;cAqBnD,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAe/E,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;CAyBzE"}
@@ -1,4 +1,4 @@
1
- // WebGL2 Query (also handles disjoint timer extensions)
1
+ // WebGL2 QuerySet (also handles disjoint timer extensions)
2
2
  import { QuerySet } from '@luma.gl/core';
3
3
  import { GL } from '@luma.gl/constants';
4
4
  /**
@@ -7,135 +7,231 @@ import { GL } from '@luma.gl/constants';
7
7
  export class WEBGLQuerySet extends QuerySet {
8
8
  device;
9
9
  handle;
10
- target = null;
11
- _queryPending = false;
12
- _pollingPromise = null;
10
+ _timestampPairs = [];
11
+ _occlusionQuery = null;
12
+ _occlusionActive = false;
13
13
  get [Symbol.toStringTag]() {
14
- return 'Query';
14
+ return 'QuerySet';
15
15
  }
16
- // Create a query class
17
16
  constructor(device, props) {
18
17
  super(device, props);
19
18
  this.device = device;
20
- if (props.count > 1) {
21
- throw new Error('WebGL QuerySet can only have one value');
19
+ if (props.type === 'timestamp') {
20
+ if (props.count < 2) {
21
+ throw new Error('Timestamp QuerySet requires at least two query slots');
22
+ }
23
+ this._timestampPairs = new Array(Math.ceil(props.count / 2))
24
+ .fill(null)
25
+ .map(() => ({ activeQuery: null, completedQueries: [] }));
26
+ this.handle = null;
22
27
  }
23
- const handle = this.device.gl.createQuery();
24
- if (!handle) {
25
- throw new Error('WebGL query not supported');
28
+ else {
29
+ if (props.count > 1) {
30
+ throw new Error('WebGL occlusion QuerySet can only have one value');
31
+ }
32
+ const handle = this.device.gl.createQuery();
33
+ if (!handle) {
34
+ throw new Error('WebGL query not supported');
35
+ }
36
+ this.handle = handle;
26
37
  }
27
- this.handle = handle;
28
38
  Object.seal(this);
29
39
  }
30
40
  destroy() {
31
- this.device.gl.deleteQuery(this.handle);
32
- }
33
- // FOR RENDER PASS AND COMMAND ENCODER
34
- /**
35
- * Shortcut for timer query (dependent on extension in both WebGL1 and 2)
36
- * Measures GPU time delta between this call and a matching `end` call in the
37
- * GPU instruction stream.
38
- */
39
- beginTimestampQuery() {
40
- return this._begin(35007);
41
+ if (this.destroyed) {
42
+ return;
43
+ }
44
+ if (this.handle) {
45
+ this.device.gl.deleteQuery(this.handle);
46
+ }
47
+ for (const pair of this._timestampPairs) {
48
+ if (pair.activeQuery) {
49
+ this.device.gl.deleteQuery(pair.activeQuery.handle);
50
+ }
51
+ for (const query of pair.completedQueries) {
52
+ this.device.gl.deleteQuery(query.handle);
53
+ }
54
+ }
55
+ if (this._occlusionQuery) {
56
+ this.device.gl.deleteQuery(this._occlusionQuery.handle);
57
+ }
58
+ this.destroyResource();
59
+ }
60
+ isResultAvailable(queryIndex) {
61
+ if (this.props.type === 'timestamp') {
62
+ if (queryIndex === undefined) {
63
+ return this._timestampPairs.some((_, pairIndex) => this._isTimestampPairAvailable(pairIndex));
64
+ }
65
+ return this._isTimestampPairAvailable(this._getTimestampPairIndex(queryIndex));
66
+ }
67
+ if (!this._occlusionQuery) {
68
+ return false;
69
+ }
70
+ return this._pollQueryAvailability(this._occlusionQuery);
71
+ }
72
+ async readResults(options) {
73
+ const firstQuery = options?.firstQuery || 0;
74
+ const queryCount = options?.queryCount || this.props.count - firstQuery;
75
+ this._validateRange(firstQuery, queryCount);
76
+ if (this.props.type === 'timestamp') {
77
+ const results = new Array(queryCount).fill(0n);
78
+ const startPairIndex = Math.floor(firstQuery / 2);
79
+ const endPairIndex = Math.floor((firstQuery + queryCount - 1) / 2);
80
+ for (let pairIndex = startPairIndex; pairIndex <= endPairIndex; pairIndex++) {
81
+ const duration = await this._consumeTimestampPairResult(pairIndex);
82
+ const beginSlot = pairIndex * 2;
83
+ const endSlot = beginSlot + 1;
84
+ if (beginSlot >= firstQuery && beginSlot < firstQuery + queryCount) {
85
+ results[beginSlot - firstQuery] = 0n;
86
+ }
87
+ if (endSlot >= firstQuery && endSlot < firstQuery + queryCount) {
88
+ results[endSlot - firstQuery] = duration;
89
+ }
90
+ }
91
+ return results;
92
+ }
93
+ if (!this._occlusionQuery) {
94
+ throw new Error('Occlusion query has not been started');
95
+ }
96
+ return [await this._consumeQueryResult(this._occlusionQuery)];
41
97
  }
42
- endTimestampQuery() {
43
- this._end();
98
+ async readTimestampDuration(beginIndex, endIndex) {
99
+ if (this.props.type !== 'timestamp') {
100
+ throw new Error('Timestamp durations require a timestamp QuerySet');
101
+ }
102
+ if (beginIndex < 0 || endIndex >= this.props.count || endIndex <= beginIndex) {
103
+ throw new Error('Timestamp duration range is out of bounds');
104
+ }
105
+ if (beginIndex % 2 !== 0 || endIndex !== beginIndex + 1) {
106
+ throw new Error('WebGL timestamp durations require adjacent even/odd query indices');
107
+ }
108
+ const result = await this._consumeTimestampPairResult(this._getTimestampPairIndex(beginIndex));
109
+ return Number(result) / 1e6;
44
110
  }
45
- // Shortcut for occlusion queries
46
- beginOcclusionQuery(options) {
47
- return this._begin(options?.conservative ? 36202 : 35887);
111
+ beginOcclusionQuery() {
112
+ if (this.props.type !== 'occlusion') {
113
+ throw new Error('Occlusion queries require an occlusion QuerySet');
114
+ }
115
+ if (!this.handle) {
116
+ throw new Error('WebGL occlusion query is not available');
117
+ }
118
+ if (this._occlusionActive) {
119
+ throw new Error('Occlusion query is already active');
120
+ }
121
+ this.device.gl.beginQuery(35887, this.handle);
122
+ this._occlusionQuery = {
123
+ handle: this.handle,
124
+ promise: null,
125
+ result: null,
126
+ disjoint: false
127
+ };
128
+ this._occlusionActive = true;
48
129
  }
49
130
  endOcclusionQuery() {
50
- this._end();
51
- }
52
- // Shortcut for transformFeedbackQuery
53
- beginTransformFeedbackQuery() {
54
- return this._begin(35976);
55
- }
56
- endTransformFeedbackQuery() {
57
- this._end();
58
- }
59
- async resolveQuery() {
60
- const value = await this.pollQuery();
61
- return [value];
62
- }
63
- // PRIVATE METHODS
64
- /**
65
- * Due to OpenGL API limitations, after calling `begin()` on one Query
66
- * instance, `end()` must be called on that same instance before
67
- * calling `begin()` on another query. While there can be multiple
68
- * outstanding queries representing disjoint `begin()`/`end()` intervals.
69
- * It is not possible to interleave or overlap `begin` and `end` calls.
70
- */
71
- _begin(target) {
72
- // Don't start a new query if one is already active.
73
- if (this._queryPending) {
74
- return;
131
+ if (!this._occlusionActive) {
132
+ throw new Error('Occlusion query is not active');
75
133
  }
76
- this.target = target;
77
- this.device.gl.beginQuery(this.target, this.handle);
78
- return;
134
+ this.device.gl.endQuery(35887);
135
+ this._occlusionActive = false;
79
136
  }
80
- // ends the current query
81
- _end() {
82
- // Can't end a new query if the last one hasn't been resolved.
83
- if (this._queryPending) {
137
+ writeTimestamp(queryIndex) {
138
+ if (this.props.type !== 'timestamp') {
139
+ throw new Error('Timestamp writes require a timestamp QuerySet');
140
+ }
141
+ const pairIndex = this._getTimestampPairIndex(queryIndex);
142
+ const pair = this._timestampPairs[pairIndex];
143
+ if (queryIndex % 2 === 0) {
144
+ if (pair.activeQuery) {
145
+ throw new Error('Timestamp query pair is already active');
146
+ }
147
+ const handle = this.device.gl.createQuery();
148
+ if (!handle) {
149
+ throw new Error('WebGL query not supported');
150
+ }
151
+ const query = {
152
+ handle,
153
+ promise: null,
154
+ result: null,
155
+ disjoint: false
156
+ };
157
+ this.device.gl.beginQuery(35007, handle);
158
+ pair.activeQuery = query;
84
159
  return;
85
160
  }
86
- if (this.target) {
87
- this.device.gl.endQuery(this.target);
88
- this.target = null;
89
- this._queryPending = true;
161
+ if (!pair.activeQuery) {
162
+ throw new Error('Timestamp query pair was ended before it was started');
90
163
  }
91
- return;
164
+ this.device.gl.endQuery(35007);
165
+ pair.completedQueries.push(pair.activeQuery);
166
+ pair.activeQuery = null;
92
167
  }
93
- // Returns true if the query result is available
94
- isResultAvailable() {
95
- if (!this._queryPending) {
96
- return false;
97
- }
98
- const resultAvailable = this.device.gl.getQueryParameter(this.handle, 34919);
99
- if (resultAvailable) {
100
- this._queryPending = false;
168
+ _validateRange(firstQuery, queryCount) {
169
+ if (firstQuery < 0 || queryCount < 0 || firstQuery + queryCount > this.props.count) {
170
+ throw new Error('Query read range is out of bounds');
101
171
  }
102
- return resultAvailable;
103
172
  }
104
- // Timing query is disjoint, i.e. results are invalid
105
- isTimerDisjoint() {
106
- return this.device.gl.getParameter(36795);
173
+ _getTimestampPairIndex(queryIndex) {
174
+ if (queryIndex < 0 || queryIndex >= this.props.count) {
175
+ throw new Error('Query index is out of bounds');
176
+ }
177
+ return Math.floor(queryIndex / 2);
107
178
  }
108
- // Returns query result.
109
- getResult() {
110
- return this.device.gl.getQueryParameter(this.handle, 34918);
179
+ _isTimestampPairAvailable(pairIndex) {
180
+ const pair = this._timestampPairs[pairIndex];
181
+ if (!pair || pair.completedQueries.length === 0) {
182
+ return false;
183
+ }
184
+ return this._pollQueryAvailability(pair.completedQueries[0]);
111
185
  }
112
- // Returns the query result, converted to milliseconds to match JavaScript conventions.
113
- getTimerMilliseconds() {
114
- return this.getResult() / 1e6;
186
+ _pollQueryAvailability(query) {
187
+ if (query.result !== null || query.disjoint) {
188
+ return true;
189
+ }
190
+ const resultAvailable = this.device.gl.getQueryParameter(query.handle, 34919);
191
+ if (!resultAvailable) {
192
+ return false;
193
+ }
194
+ const isDisjoint = Boolean(this.device.gl.getParameter(36795));
195
+ query.disjoint = isDisjoint;
196
+ query.result = isDisjoint
197
+ ? 0n
198
+ : BigInt(this.device.gl.getQueryParameter(query.handle, 34918));
199
+ return true;
200
+ }
201
+ async _consumeTimestampPairResult(pairIndex) {
202
+ const pair = this._timestampPairs[pairIndex];
203
+ if (!pair || pair.completedQueries.length === 0) {
204
+ throw new Error('Timestamp query pair has no completed result');
205
+ }
206
+ const query = pair.completedQueries.shift();
207
+ try {
208
+ return await this._consumeQueryResult(query);
209
+ }
210
+ finally {
211
+ this.device.gl.deleteQuery(query.handle);
212
+ }
115
213
  }
116
- // Polls the query
117
- pollQuery(limit = Number.POSITIVE_INFINITY) {
118
- if (this._pollingPromise) {
119
- return this._pollingPromise;
214
+ _consumeQueryResult(query) {
215
+ if (query.promise) {
216
+ return query.promise;
120
217
  }
121
- let counter = 0;
122
- this._pollingPromise = new Promise((resolve, reject) => {
218
+ query.promise = new Promise((resolve, reject) => {
123
219
  const poll = () => {
124
- if (this.isResultAvailable()) {
125
- resolve(this.getResult());
126
- this._pollingPromise = null;
220
+ if (!this._pollQueryAvailability(query)) {
221
+ requestAnimationFrame(poll);
222
+ return;
127
223
  }
128
- else if (counter++ > limit) {
129
- reject('Timed out');
130
- this._pollingPromise = null;
224
+ query.promise = null;
225
+ if (query.disjoint) {
226
+ reject(new Error('GPU timestamp query was invalidated by a disjoint event'));
131
227
  }
132
228
  else {
133
- requestAnimationFrame(poll);
229
+ resolve(query.result || 0n);
134
230
  }
135
231
  };
136
- requestAnimationFrame(poll);
232
+ poll();
137
233
  });
138
- return this._pollingPromise;
234
+ return query.promise;
139
235
  }
140
236
  }
141
237
  //# sourceMappingURL=webgl-query-set.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-query-set.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAC,QAAQ,EAAgB,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,QAAQ;IAChC,MAAM,CAAc;IACpB,MAAM,CAAa;IAE5B,MAAM,GAAkB,IAAI,CAAC;IAC7B,aAAa,GAAG,KAAK,CAAC;IACtB,eAAe,GAAwB,IAAI,CAAC;IAE5C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,uBAAuB;IACvB,YAAY,MAAmB,EAAE,KAAoB;QACnD,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAEQ,OAAO;QACd,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,sCAAsC;IAEtC;;;;OAIG;IACH,mBAAmB;QACjB,OAAO,IAAI,CAAC,MAAM,OAAqB,CAAC;IAC1C,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,iCAAiC;IACjC,mBAAmB,CAAC,OAAkC;QACpD,OAAO,IAAI,CAAC,MAAM,CAChB,OAAO,EAAE,YAAY,CAAC,CAAC,OAAoC,CAAC,MAAsB,CACnF,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,sCAAsC;IACtC,2BAA2B;QACzB,OAAO,IAAI,CAAC,MAAM,OAA0C,CAAC;IAC/D,CAAC;IAED,yBAAyB;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAED,kBAAkB;IAElB;;;;;;OAMG;IACO,MAAM,CAAC,MAAc;QAC7B,oDAAoD;QACpD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpD,OAAO;IACT,CAAC;IAED,yBAAyB;IACf,IAAI;QACZ,8DAA8D;QAC9D,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,OAAO;IACT,CAAC;IAED,gDAAgD;IAChD,iBAAiB;QACf,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CACtD,IAAI,CAAC,MAAM,QAEZ,CAAC;QACF,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC7B,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,qDAAqD;IACrD,eAAe;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,OAAqB,CAAC;IAC1D,CAAC;IAED,wBAAwB;IACxB,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,QAAkB,CAAC;IACxE,CAAC;IAED,uFAAuF;IACvF,oBAAoB;QAClB,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,CAAC;IAChC,CAAC;IAED,kBAAkB;IAClB,SAAS,CAAC,QAAgB,MAAM,CAAC,iBAAiB;QAChD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;QAC9B,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC,eAAe,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,IAAI,GAAG,GAAG,EAAE;gBAChB,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;oBAC7B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;oBAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAC9B,CAAC;qBAAM,IAAI,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;oBAC7B,MAAM,CAAC,WAAW,CAAC,CAAC;oBACpB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACN,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC,CAAC;YAEF,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;CACF"}
1
+ {"version":3,"file":"webgl-query-set.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-query-set.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAe,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAQpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAM;gBAEpB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IA6CvD,GAAG,IAAI,IAAI;IAKX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAmD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IAkCvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,YAA2B;CA4CtF"}
1
+ {"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAe,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAQpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAM;gBAEpB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAkDvD,GAAG,IAAI,IAAI;IAaX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAmD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IAkCvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,YAA2B;CA4CtF"}
@@ -49,10 +49,22 @@ export class WEBGLRenderPass extends RenderPass {
49
49
  }
50
50
  // Hack - for now WebGL draws in "immediate mode" (instead of queueing the operations)...
51
51
  this.clear();
52
+ if (this.props.timestampQuerySet && this.props.beginTimestampIndex !== undefined) {
53
+ const webglQuerySet = this.props.timestampQuerySet;
54
+ webglQuerySet.writeTimestamp(this.props.beginTimestampIndex);
55
+ }
52
56
  }
53
57
  end() {
58
+ if (this.destroyed) {
59
+ return;
60
+ }
61
+ if (this.props.timestampQuerySet && this.props.endTimestampIndex !== undefined) {
62
+ const webglQuerySet = this.props.timestampQuerySet;
63
+ webglQuerySet.writeTimestamp(this.props.endTimestampIndex);
64
+ }
54
65
  this.device.popState();
55
66
  // should add commands to CommandEncoder.
67
+ this.destroy();
56
68
  }
57
69
  pushDebugGroup(groupLabel) { }
58
70
  popDebugGroup() { }