@luma.gl/core 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.
- package/dist/adapter/canvas-context.d.ts +6 -162
- package/dist/adapter/canvas-context.d.ts.map +1 -1
- package/dist/adapter/canvas-context.js +5 -419
- package/dist/adapter/canvas-context.js.map +1 -1
- package/dist/adapter/canvas-observer.d.ts +32 -0
- package/dist/adapter/canvas-observer.d.ts.map +1 -0
- package/dist/adapter/canvas-observer.js +90 -0
- package/dist/adapter/canvas-observer.js.map +1 -0
- package/dist/adapter/canvas-surface.d.ts +150 -0
- package/dist/adapter/canvas-surface.d.ts.map +1 -0
- package/dist/adapter/canvas-surface.js +392 -0
- package/dist/adapter/canvas-surface.js.map +1 -0
- package/dist/adapter/device.d.ts +81 -16
- package/dist/adapter/device.d.ts.map +1 -1
- package/dist/adapter/device.js +193 -11
- package/dist/adapter/device.js.map +1 -1
- package/dist/adapter/luma.d.ts.map +1 -1
- package/dist/adapter/luma.js +2 -1
- package/dist/adapter/luma.js.map +1 -1
- package/dist/adapter/presentation-context.d.ts +11 -0
- package/dist/adapter/presentation-context.d.ts.map +1 -0
- package/dist/adapter/presentation-context.js +12 -0
- package/dist/adapter/presentation-context.js.map +1 -0
- package/dist/adapter/resources/buffer.d.ts +1 -1
- package/dist/adapter/resources/buffer.d.ts.map +1 -1
- package/dist/adapter/resources/buffer.js +14 -6
- package/dist/adapter/resources/buffer.js.map +1 -1
- package/dist/adapter/resources/command-buffer.d.ts +3 -1
- package/dist/adapter/resources/command-buffer.d.ts.map +1 -1
- package/dist/adapter/resources/command-buffer.js +3 -1
- package/dist/adapter/resources/command-buffer.js.map +1 -1
- package/dist/adapter/resources/command-encoder.d.ts +30 -7
- package/dist/adapter/resources/command-encoder.d.ts.map +1 -1
- package/dist/adapter/resources/command-encoder.js +68 -2
- package/dist/adapter/resources/command-encoder.js.map +1 -1
- package/dist/adapter/resources/compute-pipeline.d.ts +2 -2
- package/dist/adapter/resources/compute-pipeline.d.ts.map +1 -1
- package/dist/adapter/resources/fence.d.ts +16 -0
- package/dist/adapter/resources/fence.d.ts.map +1 -0
- package/dist/adapter/resources/fence.js +17 -0
- package/dist/adapter/resources/fence.js.map +1 -0
- package/dist/adapter/resources/framebuffer.d.ts +1 -1
- package/dist/adapter/resources/framebuffer.d.ts.map +1 -1
- package/dist/adapter/resources/framebuffer.js +15 -12
- package/dist/adapter/resources/framebuffer.js.map +1 -1
- package/dist/adapter/resources/query-set.d.ts +17 -1
- package/dist/adapter/resources/query-set.d.ts.map +1 -1
- package/dist/adapter/resources/query-set.js.map +1 -1
- package/dist/adapter/resources/render-pipeline.d.ts +28 -10
- package/dist/adapter/resources/render-pipeline.d.ts.map +1 -1
- package/dist/adapter/resources/render-pipeline.js +21 -2
- package/dist/adapter/resources/render-pipeline.js.map +1 -1
- package/dist/adapter/resources/resource.d.ts +13 -0
- package/dist/adapter/resources/resource.d.ts.map +1 -1
- package/dist/adapter/resources/resource.js +243 -14
- package/dist/adapter/resources/resource.js.map +1 -1
- package/dist/adapter/resources/shader.js +27 -25
- package/dist/adapter/resources/shader.js.map +1 -1
- package/dist/adapter/resources/shared-render-pipeline.d.ts +22 -0
- package/dist/adapter/resources/shared-render-pipeline.d.ts.map +1 -0
- package/dist/adapter/resources/shared-render-pipeline.js +25 -0
- package/dist/adapter/resources/shared-render-pipeline.js.map +1 -0
- package/dist/adapter/resources/texture-view.d.ts +1 -1
- package/dist/adapter/resources/texture-view.d.ts.map +1 -1
- package/dist/adapter/resources/texture.d.ts +168 -28
- package/dist/adapter/resources/texture.d.ts.map +1 -1
- package/dist/adapter/resources/texture.js +284 -25
- package/dist/adapter/resources/texture.js.map +1 -1
- package/dist/adapter/types/attachments.d.ts +1 -1
- package/dist/adapter/types/attachments.d.ts.map +1 -1
- package/dist/adapter/types/buffer-layout.d.ts +1 -1
- package/dist/adapter/types/buffer-layout.d.ts.map +1 -1
- package/dist/adapter/types/parameters.d.ts +3 -1
- package/dist/adapter/types/parameters.d.ts.map +1 -1
- package/dist/adapter/types/parameters.js +1 -0
- package/dist/adapter/types/parameters.js.map +1 -1
- package/dist/adapter/types/shader-layout.d.ts +10 -6
- package/dist/adapter/types/shader-layout.d.ts.map +1 -1
- package/dist/adapter/types/uniforms.d.ts +6 -0
- package/dist/adapter/types/uniforms.d.ts.map +1 -1
- package/dist/adapter-utils/bind-groups.d.ts +9 -0
- package/dist/adapter-utils/bind-groups.d.ts.map +1 -0
- package/dist/adapter-utils/bind-groups.js +41 -0
- package/dist/adapter-utils/bind-groups.js.map +1 -0
- package/dist/adapter-utils/format-compiler-log.d.ts.map +1 -1
- package/dist/adapter-utils/format-compiler-log.js +23 -15
- package/dist/adapter-utils/format-compiler-log.js.map +1 -1
- package/dist/adapter-utils/get-attribute-from-layouts.d.ts +2 -2
- package/dist/adapter-utils/get-attribute-from-layouts.d.ts.map +1 -1
- package/dist/adapter-utils/get-attribute-from-layouts.js +6 -6
- package/dist/adapter-utils/get-attribute-from-layouts.js.map +1 -1
- package/dist/dist.dev.js +2734 -644
- package/dist/dist.min.js +10 -9
- package/dist/factories/bind-group-factory.d.ts +20 -0
- package/dist/factories/bind-group-factory.d.ts.map +1 -0
- package/dist/factories/bind-group-factory.js +88 -0
- package/dist/factories/bind-group-factory.js.map +1 -0
- package/dist/factories/core-module-state.d.ts +7 -0
- package/dist/factories/core-module-state.d.ts.map +1 -0
- package/dist/{shadertypes/data-types/shader-types.js → factories/core-module-state.js} +1 -1
- package/dist/factories/core-module-state.js.map +1 -0
- package/dist/factories/pipeline-factory.d.ts +54 -0
- package/dist/factories/pipeline-factory.d.ts.map +1 -0
- package/dist/factories/pipeline-factory.js +270 -0
- package/dist/factories/pipeline-factory.js.map +1 -0
- package/dist/factories/shader-factory.d.ts +20 -0
- package/dist/factories/shader-factory.d.ts.map +1 -0
- package/dist/factories/shader-factory.js +84 -0
- package/dist/factories/shader-factory.js.map +1 -0
- package/dist/index.cjs +2447 -534
- package/dist/index.cjs.map +4 -4
- package/dist/index.d.ts +30 -14
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -7
- package/dist/index.js.map +1 -1
- package/dist/portable/shader-block-writer.d.ts +51 -0
- package/dist/portable/shader-block-writer.d.ts.map +1 -0
- package/dist/portable/shader-block-writer.js +185 -0
- package/dist/portable/shader-block-writer.js.map +1 -0
- package/dist/portable/uniform-block.d.ts +1 -1
- package/dist/portable/uniform-block.d.ts.map +1 -1
- package/dist/portable/uniform-store.d.ts +55 -24
- package/dist/portable/uniform-store.d.ts.map +1 -1
- package/dist/portable/uniform-store.js +73 -25
- package/dist/portable/uniform-store.js.map +1 -1
- package/dist/shadertypes/data-types/data-type-decoder.d.ts +20 -0
- package/dist/shadertypes/data-types/data-type-decoder.d.ts.map +1 -0
- package/dist/shadertypes/data-types/data-type-decoder.js +79 -0
- package/dist/shadertypes/data-types/data-type-decoder.js.map +1 -0
- package/dist/shadertypes/data-types/data-types.d.ts +31 -12
- package/dist/shadertypes/data-types/data-types.d.ts.map +1 -1
- package/dist/shadertypes/data-types/decode-data-types.d.ts.map +1 -1
- package/dist/shadertypes/data-types/decode-data-types.js +4 -3
- package/dist/shadertypes/data-types/decode-data-types.js.map +1 -1
- package/dist/{image-utils → shadertypes/image-types}/image-types.d.ts +0 -6
- package/dist/shadertypes/image-types/image-types.d.ts.map +1 -0
- package/dist/shadertypes/image-types/image-types.js.map +1 -0
- package/dist/shadertypes/shader-types/shader-block-layout.d.ts +72 -0
- package/dist/shadertypes/shader-types/shader-block-layout.d.ts.map +1 -0
- package/dist/shadertypes/shader-types/shader-block-layout.js +209 -0
- package/dist/shadertypes/shader-types/shader-block-layout.js.map +1 -0
- package/dist/shadertypes/shader-types/shader-type-decoder.d.ts +41 -0
- package/dist/shadertypes/shader-types/shader-type-decoder.d.ts.map +1 -0
- package/dist/shadertypes/{data-types/decode-shader-types.js → shader-types/shader-type-decoder.js} +43 -4
- package/dist/shadertypes/shader-types/shader-type-decoder.js.map +1 -0
- package/dist/shadertypes/shader-types/shader-types.d.ts +101 -0
- package/dist/shadertypes/shader-types/shader-types.d.ts.map +1 -0
- package/dist/shadertypes/shader-types/shader-types.js +30 -0
- package/dist/shadertypes/shader-types/shader-types.js.map +1 -0
- package/dist/shadertypes/texture-types/pixel-utils.d.ts.map +1 -0
- package/dist/shadertypes/{textures → texture-types}/pixel-utils.js +4 -4
- package/dist/shadertypes/texture-types/pixel-utils.js.map +1 -0
- package/dist/shadertypes/texture-types/texture-format-decoder.d.ts +36 -0
- package/dist/shadertypes/texture-types/texture-format-decoder.d.ts.map +1 -0
- package/dist/shadertypes/{textures → texture-types}/texture-format-decoder.js +110 -38
- package/dist/shadertypes/texture-types/texture-format-decoder.js.map +1 -0
- package/dist/shadertypes/texture-types/texture-format-generics.d.ts +34 -0
- package/dist/shadertypes/texture-types/texture-format-generics.d.ts.map +1 -0
- package/dist/shadertypes/texture-types/texture-format-generics.js.map +1 -0
- package/dist/shadertypes/texture-types/texture-format-table.d.ts.map +1 -0
- package/dist/shadertypes/{textures → texture-types}/texture-format-table.js +12 -11
- package/dist/shadertypes/texture-types/texture-format-table.js.map +1 -0
- package/dist/shadertypes/{textures → texture-types}/texture-formats.d.ts +51 -17
- package/dist/shadertypes/texture-types/texture-formats.d.ts.map +1 -0
- package/dist/shadertypes/{textures → texture-types}/texture-formats.js +1 -0
- package/dist/shadertypes/texture-types/texture-formats.js.map +1 -0
- package/dist/shadertypes/texture-types/texture-layout.d.ts +5 -0
- package/dist/shadertypes/texture-types/texture-layout.d.ts.map +1 -0
- package/dist/shadertypes/texture-types/texture-layout.js +41 -0
- package/dist/shadertypes/texture-types/texture-layout.js.map +1 -0
- package/dist/shadertypes/vertex-types/vertex-format-decoder.d.ts +24 -0
- package/dist/shadertypes/vertex-types/vertex-format-decoder.d.ts.map +1 -0
- package/dist/shadertypes/vertex-types/vertex-format-decoder.js +144 -0
- package/dist/shadertypes/vertex-types/vertex-format-decoder.js.map +1 -0
- package/dist/shadertypes/vertex-types/vertex-formats.d.ts +50 -0
- package/dist/shadertypes/vertex-types/vertex-formats.d.ts.map +1 -0
- package/dist/shadertypes/vertex-types/vertex-formats.js.map +1 -0
- package/dist/utils/array-equal.d.ts +1 -1
- package/dist/utils/array-equal.d.ts.map +1 -1
- package/dist/utils/array-equal.js +15 -9
- package/dist/utils/array-equal.js.map +1 -1
- package/dist/utils/assert.d.ts +5 -0
- package/dist/utils/assert.d.ts.map +1 -0
- package/dist/utils/assert.js +17 -0
- package/dist/utils/assert.js.map +1 -0
- package/dist/utils/stats-manager.d.ts.map +1 -1
- package/dist/utils/stats-manager.js +61 -1
- package/dist/utils/stats-manager.js.map +1 -1
- package/package.json +6 -6
- package/src/adapter/canvas-context.ts +7 -556
- package/src/adapter/canvas-observer.ts +130 -0
- package/src/adapter/canvas-surface.ts +521 -0
- package/src/adapter/device.ts +311 -25
- package/src/adapter/luma.ts +1 -0
- package/src/adapter/presentation-context.ts +16 -0
- package/src/adapter/resources/buffer.ts +13 -5
- package/src/adapter/resources/command-buffer.ts +4 -2
- package/src/adapter/resources/command-encoder.ts +101 -10
- package/src/adapter/resources/compute-pipeline.ts +2 -2
- package/src/adapter/resources/fence.ts +32 -0
- package/src/adapter/resources/framebuffer.ts +16 -13
- package/src/adapter/resources/query-set.ts +17 -1
- package/src/adapter/resources/render-pipeline.ts +52 -16
- package/src/adapter/resources/resource.ts +289 -14
- package/src/adapter/resources/shader.ts +28 -28
- package/src/adapter/resources/shared-render-pipeline.ts +40 -0
- package/src/adapter/resources/texture-view.ts +1 -1
- package/src/adapter/resources/texture.ts +427 -49
- package/src/adapter/types/attachments.ts +1 -1
- package/src/adapter/types/buffer-layout.ts +1 -1
- package/src/adapter/types/parameters.ts +4 -1
- package/src/adapter/types/shader-layout.ts +15 -9
- package/src/adapter/types/uniforms.ts +12 -0
- package/src/adapter-utils/bind-groups.ts +71 -0
- package/src/adapter-utils/format-compiler-log.ts +23 -15
- package/src/adapter-utils/get-attribute-from-layouts.ts +8 -11
- package/src/factories/bind-group-factory.ts +157 -0
- package/src/factories/core-module-state.ts +11 -0
- package/src/factories/pipeline-factory.ts +328 -0
- package/src/factories/shader-factory.ts +103 -0
- package/src/index.ts +70 -26
- package/src/portable/shader-block-writer.ts +254 -0
- package/src/portable/uniform-block.ts +1 -1
- package/src/portable/uniform-store.ts +98 -40
- package/src/shadertypes/data-types/data-type-decoder.ts +105 -0
- package/src/shadertypes/data-types/data-types.ts +100 -48
- package/src/shadertypes/data-types/decode-data-types.ts +4 -3
- package/src/{image-utils → shadertypes/image-types}/image-types.ts +0 -7
- package/src/shadertypes/shader-types/shader-block-layout.ts +340 -0
- package/src/shadertypes/{data-types/decode-shader-types.ts → shader-types/shader-type-decoder.ts} +88 -14
- package/src/shadertypes/shader-types/shader-types.ts +207 -0
- package/src/shadertypes/{textures → texture-types}/pixel-utils.ts +4 -4
- package/src/shadertypes/{textures → texture-types}/texture-format-decoder.ts +167 -46
- package/src/shadertypes/{textures → texture-types}/texture-format-generics.ts +42 -48
- package/src/shadertypes/{textures → texture-types}/texture-format-table.ts +12 -11
- package/src/shadertypes/{textures → texture-types}/texture-formats.ts +73 -17
- package/src/shadertypes/texture-types/texture-layout.ts +60 -0
- package/src/shadertypes/vertex-types/vertex-format-decoder.ts +175 -0
- package/src/shadertypes/vertex-types/vertex-formats.ts +196 -0
- package/src/utils/array-equal.ts +21 -9
- package/src/utils/assert.ts +18 -0
- package/src/utils/stats-manager.ts +76 -2
- package/dist/image-utils/image-types.d.ts.map +0 -1
- package/dist/image-utils/image-types.js.map +0 -1
- package/dist/portable/uniform-buffer-layout.d.ts +0 -28
- package/dist/portable/uniform-buffer-layout.d.ts.map +0 -1
- package/dist/portable/uniform-buffer-layout.js +0 -96
- package/dist/portable/uniform-buffer-layout.js.map +0 -1
- package/dist/shadertypes/data-types/decode-shader-types.d.ts +0 -17
- package/dist/shadertypes/data-types/decode-shader-types.d.ts.map +0 -1
- package/dist/shadertypes/data-types/decode-shader-types.js.map +0 -1
- package/dist/shadertypes/data-types/shader-types.d.ts +0 -45
- package/dist/shadertypes/data-types/shader-types.d.ts.map +0 -1
- package/dist/shadertypes/data-types/shader-types.js.map +0 -1
- package/dist/shadertypes/textures/pixel-utils.d.ts.map +0 -1
- package/dist/shadertypes/textures/pixel-utils.js.map +0 -1
- package/dist/shadertypes/textures/texture-format-decoder.d.ts +0 -18
- package/dist/shadertypes/textures/texture-format-decoder.d.ts.map +0 -1
- package/dist/shadertypes/textures/texture-format-decoder.js.map +0 -1
- package/dist/shadertypes/textures/texture-format-generics.d.ts +0 -33
- package/dist/shadertypes/textures/texture-format-generics.d.ts.map +0 -1
- package/dist/shadertypes/textures/texture-format-generics.js.map +0 -1
- package/dist/shadertypes/textures/texture-format-table.d.ts.map +0 -1
- package/dist/shadertypes/textures/texture-format-table.js.map +0 -1
- package/dist/shadertypes/textures/texture-formats.d.ts.map +0 -1
- package/dist/shadertypes/textures/texture-formats.js.map +0 -1
- package/dist/shadertypes/vertex-arrays/decode-vertex-format.d.ts +0 -18
- package/dist/shadertypes/vertex-arrays/decode-vertex-format.d.ts.map +0 -1
- package/dist/shadertypes/vertex-arrays/decode-vertex-format.js +0 -100
- package/dist/shadertypes/vertex-arrays/decode-vertex-format.js.map +0 -1
- package/dist/shadertypes/vertex-arrays/vertex-formats.d.ts +0 -27
- package/dist/shadertypes/vertex-arrays/vertex-formats.d.ts.map +0 -1
- package/dist/shadertypes/vertex-arrays/vertex-formats.js.map +0 -1
- package/src/portable/uniform-buffer-layout.ts +0 -118
- package/src/shadertypes/data-types/shader-types.ts +0 -87
- package/src/shadertypes/vertex-arrays/decode-vertex-format.ts +0 -124
- package/src/shadertypes/vertex-arrays/vertex-formats.ts +0 -91
- /package/dist/{image-utils → shadertypes/image-types}/image-types.js +0 -0
- /package/dist/shadertypes/{textures → texture-types}/pixel-utils.d.ts +0 -0
- /package/dist/shadertypes/{textures → texture-types}/texture-format-generics.js +0 -0
- /package/dist/shadertypes/{textures → texture-types}/texture-format-table.d.ts +0 -0
- /package/dist/shadertypes/{vertex-arrays → vertex-types}/vertex-formats.js +0 -0
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
// luma.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
import { dataTypeDecoder } from "../data-types/data-type-decoder.js";
|
|
5
|
+
export class VertexFormatDecoder {
|
|
6
|
+
/**
|
|
7
|
+
* Decodes a vertex format, returning type, components, byte length and flags (integer, signed, normalized)
|
|
8
|
+
*/
|
|
9
|
+
getVertexFormatInfo(format) {
|
|
10
|
+
// Strip the -webgl ending if present
|
|
11
|
+
let webglOnly;
|
|
12
|
+
if (format.endsWith('-webgl')) {
|
|
13
|
+
format.replace('-webgl', '');
|
|
14
|
+
webglOnly = true;
|
|
15
|
+
}
|
|
16
|
+
// split components from type
|
|
17
|
+
const [type_, count] = format.split('x');
|
|
18
|
+
const type = type_;
|
|
19
|
+
const components = (count ? parseInt(count) : 1);
|
|
20
|
+
// decode the type
|
|
21
|
+
const decodedType = dataTypeDecoder.getDataTypeInfo(type);
|
|
22
|
+
const result = {
|
|
23
|
+
type,
|
|
24
|
+
components,
|
|
25
|
+
byteLength: decodedType.byteLength * components,
|
|
26
|
+
integer: decodedType.integer,
|
|
27
|
+
signed: decodedType.signed,
|
|
28
|
+
normalized: decodedType.normalized
|
|
29
|
+
};
|
|
30
|
+
if (webglOnly) {
|
|
31
|
+
result.webglOnly = true;
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
}
|
|
35
|
+
/** Build a vertex format from a signed data type and a component */
|
|
36
|
+
makeVertexFormat(signedDataType, components, normalized) {
|
|
37
|
+
const dataType = normalized
|
|
38
|
+
? dataTypeDecoder.getNormalizedDataType(signedDataType)
|
|
39
|
+
: signedDataType;
|
|
40
|
+
switch (dataType) {
|
|
41
|
+
// Special cases for WebGL-only x3 formats that WebGPU does not support.
|
|
42
|
+
case 'unorm8':
|
|
43
|
+
if (components === 1) {
|
|
44
|
+
return 'unorm8';
|
|
45
|
+
}
|
|
46
|
+
if (components === 3) {
|
|
47
|
+
return 'unorm8x3-webgl';
|
|
48
|
+
}
|
|
49
|
+
return `${dataType}x${components}`;
|
|
50
|
+
case 'snorm8':
|
|
51
|
+
if (components === 1) {
|
|
52
|
+
return 'snorm8';
|
|
53
|
+
}
|
|
54
|
+
if (components === 3) {
|
|
55
|
+
return 'snorm8x3-webgl';
|
|
56
|
+
}
|
|
57
|
+
return `${dataType}x${components}`;
|
|
58
|
+
case 'uint8':
|
|
59
|
+
case 'sint8':
|
|
60
|
+
// WebGPU 8 bit formats must be aligned to 16 bit boundaries.
|
|
61
|
+
if (components === 1 || components === 3) {
|
|
62
|
+
throw new Error(`size: ${components}`);
|
|
63
|
+
}
|
|
64
|
+
return `${dataType}x${components}`;
|
|
65
|
+
case 'uint16':
|
|
66
|
+
if (components === 1) {
|
|
67
|
+
return 'uint16';
|
|
68
|
+
}
|
|
69
|
+
if (components === 3) {
|
|
70
|
+
return 'uint16x3-webgl';
|
|
71
|
+
}
|
|
72
|
+
return `${dataType}x${components}`;
|
|
73
|
+
case 'sint16':
|
|
74
|
+
if (components === 1) {
|
|
75
|
+
return 'sint16';
|
|
76
|
+
}
|
|
77
|
+
if (components === 3) {
|
|
78
|
+
return 'sint16x3-webgl';
|
|
79
|
+
}
|
|
80
|
+
return `${dataType}x${components}`;
|
|
81
|
+
case 'unorm16':
|
|
82
|
+
if (components === 1) {
|
|
83
|
+
return 'unorm16';
|
|
84
|
+
}
|
|
85
|
+
if (components === 3) {
|
|
86
|
+
return 'unorm16x3-webgl';
|
|
87
|
+
}
|
|
88
|
+
return `${dataType}x${components}`;
|
|
89
|
+
case 'snorm16':
|
|
90
|
+
if (components === 1) {
|
|
91
|
+
return 'snorm16';
|
|
92
|
+
}
|
|
93
|
+
if (components === 3) {
|
|
94
|
+
return 'snorm16x3-webgl';
|
|
95
|
+
}
|
|
96
|
+
return `${dataType}x${components}`;
|
|
97
|
+
case 'float16':
|
|
98
|
+
// WebGPU 16 bit formats must be aligned to 32 bit boundaries
|
|
99
|
+
if (components === 1 || components === 3) {
|
|
100
|
+
throw new Error(`size: ${components}`);
|
|
101
|
+
}
|
|
102
|
+
return `${dataType}x${components}`;
|
|
103
|
+
default:
|
|
104
|
+
return components === 1 ? dataType : `${dataType}x${components}`;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/** Get the vertex format for an attribute with TypedArray and size */
|
|
108
|
+
getVertexFormatFromAttribute(typedArray, size, normalized) {
|
|
109
|
+
if (!size || size > 4) {
|
|
110
|
+
throw new Error(`size ${size}`);
|
|
111
|
+
}
|
|
112
|
+
const components = size;
|
|
113
|
+
const signedDataType = dataTypeDecoder.getDataType(typedArray);
|
|
114
|
+
return this.makeVertexFormat(signedDataType, components, normalized);
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Return a "default" vertex format for a certain shader data type
|
|
118
|
+
* The simplest vertex format that matches the shader attribute's data type
|
|
119
|
+
*/
|
|
120
|
+
getCompatibleVertexFormat(opts) {
|
|
121
|
+
let vertexType;
|
|
122
|
+
switch (opts.primitiveType) {
|
|
123
|
+
case 'f32':
|
|
124
|
+
vertexType = 'float32';
|
|
125
|
+
break;
|
|
126
|
+
case 'i32':
|
|
127
|
+
vertexType = 'sint32';
|
|
128
|
+
break;
|
|
129
|
+
case 'u32':
|
|
130
|
+
vertexType = 'uint32';
|
|
131
|
+
break;
|
|
132
|
+
case 'f16':
|
|
133
|
+
return opts.components <= 2 ? 'float16x2' : 'float16x4';
|
|
134
|
+
}
|
|
135
|
+
// TODO logic does not work for float16
|
|
136
|
+
if (opts.components === 1) {
|
|
137
|
+
return vertexType;
|
|
138
|
+
}
|
|
139
|
+
return `${vertexType}x${opts.components}`;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
/** Decoder for luma.gl vertex types */
|
|
143
|
+
export const vertexFormatDecoder = new VertexFormatDecoder();
|
|
144
|
+
//# sourceMappingURL=vertex-format-decoder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vertex-format-decoder.js","sourceRoot":"","sources":["../../../src/shadertypes/vertex-types/vertex-format-decoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { DataTypeIsIntegerT, DataTypeIsNormalizedT, DataTypeIsSignedT } from "../data-types/data-types.js";
|
|
2
|
+
/**
|
|
3
|
+
* Describes the **memory format** and interpretation (normalization) of a buffer that will be supplied to vertex attributes
|
|
4
|
+
* @note Must be compatible with the AttributeShaderType of the shaders, see documentation.
|
|
5
|
+
* @note This is a superset of WebGPU vertex formats to allow for some flexibility for WebGL only applications
|
|
6
|
+
* @todo Add device.isVertexFormatSupported() method?
|
|
7
|
+
*/
|
|
8
|
+
export type VertexFormat = 'uint8' | 'uint8x2' | 'uint8x4' | 'sint8' | 'sint8x2' | 'sint8x4' | 'unorm8' | 'unorm8x2' | 'unorm8x3-webgl' | 'unorm8x4' | 'unorm8x4-bgra' | 'unorm10-10-10-2' | 'snorm8' | 'snorm8x2' | 'snorm8x3-webgl' | 'snorm8x4' | 'uint16' | 'sint16' | 'unorm16' | 'snorm16' | 'uint16x2' | 'uint16x3-webgl' | 'uint16x4' | 'sint16x2' | 'sint16x3-webgl' | 'sint16x4' | 'unorm16x2' | 'unorm16x3-webgl' | 'unorm16x4' | 'snorm16x2' | 'snorm16x3-webgl' | 'snorm16x4' | 'uint32' | 'uint32x2' | 'uint32x3' | 'uint32x4' | 'sint32' | 'sint32x2' | 'sint32x3' | 'sint32x4' | 'float16' | 'float16x2' | 'float16x4' | 'float32' | 'float32x2' | 'float32x3' | 'float32x4';
|
|
9
|
+
/**
|
|
10
|
+
* @type Information about a vertex format
|
|
11
|
+
*/
|
|
12
|
+
export type VertexFormatInfo<T extends VertexFormat = VertexFormat> = {
|
|
13
|
+
/** Type of each component */
|
|
14
|
+
type: VertexFormatDataTypeT<T>;
|
|
15
|
+
/** Number of components per vertex / row */
|
|
16
|
+
components: VertexFormatComponentsT<T>;
|
|
17
|
+
/** Is this an integer format (normalized integer formats are not integer) */
|
|
18
|
+
integer: DataTypeIsIntegerT<VertexFormatDataTypeT<T>>;
|
|
19
|
+
/** Is this a signed format? */
|
|
20
|
+
signed: DataTypeIsSignedT<VertexFormatDataTypeT<T>>;
|
|
21
|
+
/** Is this a normalized format? */
|
|
22
|
+
normalized: DataTypeIsNormalizedT<VertexFormatDataTypeT<T>>;
|
|
23
|
+
/** Length in bytes */
|
|
24
|
+
byteLength: number;
|
|
25
|
+
/** Is this a bgra format? */
|
|
26
|
+
bgra?: boolean;
|
|
27
|
+
/** Is this a webgl only format? */
|
|
28
|
+
webglOnly?: boolean;
|
|
29
|
+
};
|
|
30
|
+
/** @type the NormalizedDataType of the components in a VertexFormat */
|
|
31
|
+
export type VertexFormatDataTypeT<T extends VertexFormat> = T extends VertexFormatUint8 ? 'uint8' : T extends VertexFormatSint8 ? 'sint8' : T extends VertexFormatUnorm8 ? 'unorm8' : T extends VertexFormatSnorm8 ? 'snorm8' : T extends VertexFormatUint16 ? 'uint16' : T extends VertexFormatSint16 ? 'sint16' : T extends VertexFormatUnorm16 ? 'unorm16' : T extends VertexFormatSnorm16 ? 'snorm16' : T extends VertexFormatUint32 ? 'uint32' : T extends VertexFormatSint32 ? 'sint32' : T extends VertexFormatFloat16 ? 'float16' : T extends VertexFormatFloat32 ? 'float32' : never;
|
|
32
|
+
/** @type number - the number of components in a VertexFormat */
|
|
33
|
+
export type VertexFormatComponentsT<T extends VertexFormat> = T extends VertexFormat2Components ? 2 : T extends VertexFormat3Components ? 3 : T extends VertexFormat4Components ? 4 : 1;
|
|
34
|
+
type VertexFormatUint8 = 'uint8' | 'uint8x2' | 'uint8x4';
|
|
35
|
+
type VertexFormatSint8 = 'sint8' | 'sint8x2' | 'sint8x4';
|
|
36
|
+
type VertexFormatUnorm8 = 'unorm8' | 'unorm8x2' | 'unorm8x3-webgl' | 'unorm8x4' | 'unorm8x4-bgra' | 'unorm10-10-10-2';
|
|
37
|
+
type VertexFormatSnorm8 = 'snorm8' | 'snorm8x2' | 'snorm8x3-webgl' | 'snorm8x4';
|
|
38
|
+
type VertexFormatUint16 = 'uint16' | 'uint16x2' | 'uint16x3-webgl' | 'uint16x4';
|
|
39
|
+
type VertexFormatSint16 = 'sint16' | 'sint16x2' | 'sint16x3-webgl' | 'sint16x4';
|
|
40
|
+
type VertexFormatUnorm16 = 'unorm16' | 'unorm16x2' | 'unorm16x3-webgl' | 'unorm16x4';
|
|
41
|
+
type VertexFormatSnorm16 = 'snorm16' | 'snorm16x2' | 'snorm16x3-webgl' | 'snorm16x4';
|
|
42
|
+
type VertexFormatUint32 = 'uint32' | 'uint32x2' | 'uint32x3' | 'uint32x4';
|
|
43
|
+
type VertexFormatSint32 = 'sint32' | 'sint32x2' | 'sint32x3' | 'sint32x4';
|
|
44
|
+
type VertexFormatFloat16 = 'float16' | 'float16x2' | 'float16x4';
|
|
45
|
+
type VertexFormatFloat32 = 'float32' | 'float32x2' | 'float32x3' | 'float32x4';
|
|
46
|
+
type VertexFormat2Components = 'uint8x2' | 'sint8x2' | 'unorm8x2' | 'snorm8x2' | 'uint16x2' | 'sint16x2' | 'unorm16x2' | 'snorm16x2' | 'uint32x2' | 'sint32x2' | 'float16x2' | 'float32x2';
|
|
47
|
+
type VertexFormat3Components = 'unorm8x3-webgl' | 'snorm8x3-webgl' | 'uint16x3-webgl' | 'sint16x3-webgl' | 'unorm16x3-webgl' | 'snorm16x3-webgl' | 'uint32x3' | 'sint32x3' | 'float32x3';
|
|
48
|
+
type VertexFormat4Components = 'uint8x4' | 'sint8x4' | 'unorm8x4' | 'unorm8x4-bgra' | 'unorm10-10-10-2' | 'snorm8x4' | 'uint16x4' | 'sint16x4' | 'unorm16x4' | 'snorm16x4' | 'uint32x4' | 'sint32x4' | 'float16x4' | 'float32x4';
|
|
49
|
+
export {};
|
|
50
|
+
//# sourceMappingURL=vertex-formats.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vertex-formats.d.ts","sourceRoot":"","sources":["../../../src/shadertypes/vertex-types/vertex-formats.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vertex-formats.js","sourceRoot":"","sources":["../../../src/shadertypes/vertex-types/vertex-formats.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** Test if two arrays are deep equal, with a length limit that defaults to 16 */
|
|
1
|
+
/** Test if two arrays are deep equal, with a small-array length limit that defaults to 16 */
|
|
2
2
|
export declare function arrayEqual(a: unknown, b: unknown, limit?: number): boolean;
|
|
3
3
|
/** Copy a value */
|
|
4
4
|
export declare function arrayCopy<T>(a: T): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array-equal.d.ts","sourceRoot":"","sources":["../../src/utils/array-equal.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"array-equal.d.ts","sourceRoot":"","sources":["../../src/utils/array-equal.ts"],"names":[],"mappings":"AAQA,6FAA6F;AAC7F,wBAAgB,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,GAAE,MAAW,WA2BpE;AAED,mBAAmB;AACnB,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAKpC"}
|
|
@@ -2,21 +2,27 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { isNumberArray } from "./is-array.js";
|
|
5
|
-
|
|
5
|
+
const MAX_ELEMENTWISE_ARRAY_COMPARE_LENGTH = 128;
|
|
6
|
+
/** Test if two arrays are deep equal, with a small-array length limit that defaults to 16 */
|
|
6
7
|
export function arrayEqual(a, b, limit = 16) {
|
|
7
|
-
if (a
|
|
8
|
-
return
|
|
8
|
+
if (a === b) {
|
|
9
|
+
return true;
|
|
9
10
|
}
|
|
10
11
|
const arrayA = a;
|
|
11
12
|
const arrayB = b;
|
|
12
|
-
if (!isNumberArray(arrayA)) {
|
|
13
|
+
if (!isNumberArray(arrayA) || !isNumberArray(arrayB)) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
if (arrayA.length !== arrayB.length) {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
const maxCompareLength = Math.min(limit, MAX_ELEMENTWISE_ARRAY_COMPARE_LENGTH);
|
|
20
|
+
if (arrayA.length > maxCompareLength) {
|
|
13
21
|
return false;
|
|
14
22
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
23
|
+
for (let i = 0; i < arrayA.length; ++i) {
|
|
24
|
+
if (arrayB[i] !== arrayA[i]) {
|
|
25
|
+
return false;
|
|
20
26
|
}
|
|
21
27
|
}
|
|
22
28
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array-equal.js","sourceRoot":"","sources":["../../src/utils/array-equal.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,aAAa,EAAC,sBAAmB;AAEzC,
|
|
1
|
+
{"version":3,"file":"array-equal.js","sourceRoot":"","sources":["../../src/utils/array-equal.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,aAAa,EAAC,sBAAmB;AAEzC,MAAM,oCAAoC,GAAG,GAAG,CAAC;AAEjD,6FAA6F;AAC7F,MAAM,UAAU,UAAU,CAAC,CAAU,EAAE,CAAU,EAAE,QAAgB,EAAE;IACnE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,CAAC,CAAC;IACjB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,oCAAoC,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,MAAM,GAAG,gBAAgB,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACvC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mBAAmB;AACnB,MAAM,UAAU,SAAS,CAAI,CAAI;IAC/B,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,CAAC,CAAC,KAAK,EAAO,CAAC;IACxB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Throws if condition is true and narrows type */
|
|
2
|
+
export declare function assert(condition: unknown, message?: string): asserts condition;
|
|
3
|
+
/** Throws if value is not defined, narrows type */
|
|
4
|
+
export declare function assertDefined<T>(value: T | undefined, message?: string): T;
|
|
5
|
+
//# sourceMappingURL=assert.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/utils/assert.ts"],"names":[],"mappings":"AAIA,mDAAmD;AACnD,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAM9E;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAG1E"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
// luma.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
/** Throws if condition is true and narrows type */
|
|
5
|
+
export function assert(condition, message) {
|
|
6
|
+
if (!condition) {
|
|
7
|
+
const error = new Error(message ?? 'luma.gl assertion failed.');
|
|
8
|
+
Error.captureStackTrace?.(error, assert);
|
|
9
|
+
throw error;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
/** Throws if value is not defined, narrows type */
|
|
13
|
+
export function assertDefined(value, message) {
|
|
14
|
+
assert(value, message);
|
|
15
|
+
return value;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=assert.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../src/utils/assert.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,mDAAmD;AACnD,MAAM,UAAU,MAAM,CAAC,SAAkB,EAAE,OAAgB;IACzD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,IAAI,2BAA2B,CAAC,CAAC;QAChE,KAAK,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,aAAa,CAAI,KAAoB,EAAE,OAAgB;IACrE,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-manager.d.ts","sourceRoot":"","sources":["../../src/utils/stats-manager.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"stats-manager.d.ts","sourceRoot":"","sources":["../../src/utils/stats-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAO,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAwB5C;;GAEG;AACH,qBAAa,YAAY;IACvB,KAAK,gBAAa;IAElB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAI7B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;CAYzB;AAED,2CAA2C;AAC3C,eAAO,MAAM,SAAS,EAAE,YAAiC,CAAC"}
|
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { Stats } from '@probe.gl/stats';
|
|
5
|
+
const GPU_TIME_AND_MEMORY_STATS = 'GPU Time and Memory';
|
|
6
|
+
const GPU_TIME_AND_MEMORY_STAT_ORDER = [
|
|
7
|
+
'Adapter',
|
|
8
|
+
'GPU',
|
|
9
|
+
'GPU Type',
|
|
10
|
+
'GPU Backend',
|
|
11
|
+
'Frame Rate',
|
|
12
|
+
'CPU Time',
|
|
13
|
+
'GPU Time',
|
|
14
|
+
'GPU Memory',
|
|
15
|
+
'Buffer Memory',
|
|
16
|
+
'Texture Memory',
|
|
17
|
+
'Referenced Buffer Memory',
|
|
18
|
+
'Referenced Texture Memory',
|
|
19
|
+
'Swap Chain Texture'
|
|
20
|
+
];
|
|
21
|
+
const ORDERED_STATS_CACHE = new WeakMap();
|
|
22
|
+
const ORDERED_STAT_NAME_SET_CACHE = new WeakMap();
|
|
5
23
|
/**
|
|
6
24
|
* Helper class managing a collection of probe.gl stats objects
|
|
7
25
|
*/
|
|
@@ -14,9 +32,51 @@ export class StatsManager {
|
|
|
14
32
|
if (!this.stats.has(name)) {
|
|
15
33
|
this.stats.set(name, new Stats({ id: name }));
|
|
16
34
|
}
|
|
17
|
-
|
|
35
|
+
const stats = this.stats.get(name);
|
|
36
|
+
if (name === GPU_TIME_AND_MEMORY_STATS) {
|
|
37
|
+
initializeStats(stats, GPU_TIME_AND_MEMORY_STAT_ORDER);
|
|
38
|
+
}
|
|
39
|
+
return stats;
|
|
18
40
|
}
|
|
19
41
|
}
|
|
20
42
|
/** Global stats for all luma.gl devices */
|
|
21
43
|
export const lumaStats = new StatsManager();
|
|
44
|
+
function initializeStats(stats, orderedStatNames) {
|
|
45
|
+
const statsMap = stats.stats;
|
|
46
|
+
let addedOrderedStat = false;
|
|
47
|
+
for (const statName of orderedStatNames) {
|
|
48
|
+
if (!statsMap[statName]) {
|
|
49
|
+
stats.get(statName);
|
|
50
|
+
addedOrderedStat = true;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const statCount = Object.keys(statsMap).length;
|
|
54
|
+
const cachedStats = ORDERED_STATS_CACHE.get(stats);
|
|
55
|
+
if (!addedOrderedStat &&
|
|
56
|
+
cachedStats?.orderedStatNames === orderedStatNames &&
|
|
57
|
+
cachedStats.statCount === statCount) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const reorderedStats = {};
|
|
61
|
+
let orderedStatNamesSet = ORDERED_STAT_NAME_SET_CACHE.get(orderedStatNames);
|
|
62
|
+
if (!orderedStatNamesSet) {
|
|
63
|
+
orderedStatNamesSet = new Set(orderedStatNames);
|
|
64
|
+
ORDERED_STAT_NAME_SET_CACHE.set(orderedStatNames, orderedStatNamesSet);
|
|
65
|
+
}
|
|
66
|
+
for (const statName of orderedStatNames) {
|
|
67
|
+
if (statsMap[statName]) {
|
|
68
|
+
reorderedStats[statName] = statsMap[statName];
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
for (const [statName, stat] of Object.entries(statsMap)) {
|
|
72
|
+
if (!orderedStatNamesSet.has(statName)) {
|
|
73
|
+
reorderedStats[statName] = stat;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
for (const statName of Object.keys(statsMap)) {
|
|
77
|
+
delete statsMap[statName];
|
|
78
|
+
}
|
|
79
|
+
Object.assign(statsMap, reorderedStats);
|
|
80
|
+
ORDERED_STATS_CACHE.set(stats, { orderedStatNames, statCount });
|
|
81
|
+
}
|
|
22
82
|
//# sourceMappingURL=stats-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-manager.js","sourceRoot":"","sources":["../../src/utils/stats-manager.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,
|
|
1
|
+
{"version":3,"file":"stats-manager.js","sourceRoot":"","sources":["../../src/utils/stats-manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luma.gl/core",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.3.0-alpha.11",
|
|
4
4
|
"description": "The luma.gl core Device API",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@math.gl/types": "^4.1.0",
|
|
44
|
-
"@probe.gl/env": "^4.
|
|
45
|
-
"@probe.gl/log": "^4.
|
|
46
|
-
"@probe.gl/stats": "^4.
|
|
47
|
-
"@types/offscreencanvas": "^2019.
|
|
44
|
+
"@probe.gl/env": "^4.1.1",
|
|
45
|
+
"@probe.gl/log": "^4.1.1",
|
|
46
|
+
"@probe.gl/stats": "^4.1.1",
|
|
47
|
+
"@types/offscreencanvas": "^2019.7.3"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "06f489c5d0681bdf7bb0956ca37ce5ad56b85084"
|
|
50
50
|
}
|