@luma.gl/shadertools 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/dist.dev.js +5388 -6438
- package/dist/dist.min.js +2264 -322
- package/dist/index.cjs +3601 -566
- package/dist/index.cjs.map +4 -4
- package/dist/index.d.ts +12 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/glsl-utils/shader-utils.js +4 -4
- package/dist/lib/glsl-utils/shader-utils.js.map +1 -1
- package/dist/lib/preprocessor/preprocessor.d.ts.map +1 -1
- package/dist/lib/preprocessor/preprocessor.js +35 -8
- package/dist/lib/preprocessor/preprocessor.js.map +1 -1
- package/dist/lib/shader-assembler.d.ts +10 -0
- package/dist/lib/shader-assembler.d.ts.map +1 -1
- package/dist/lib/shader-assembler.js +20 -3
- package/dist/lib/shader-assembler.js.map +1 -1
- package/dist/lib/shader-assembly/assemble-shaders.d.ts +23 -2
- package/dist/lib/shader-assembly/assemble-shaders.d.ts.map +1 -1
- package/dist/lib/shader-assembly/assemble-shaders.js +265 -12
- package/dist/lib/shader-assembly/assemble-shaders.js.map +1 -1
- package/dist/lib/shader-assembly/wgsl-binding-debug.d.ts +37 -0
- package/dist/lib/shader-assembly/wgsl-binding-debug.d.ts.map +1 -0
- package/dist/lib/shader-assembly/wgsl-binding-debug.js +144 -0
- package/dist/lib/shader-assembly/wgsl-binding-debug.js.map +1 -0
- package/dist/lib/shader-assembly/wgsl-binding-scan.d.ts +19 -0
- package/dist/lib/shader-assembly/wgsl-binding-scan.d.ts.map +1 -0
- package/dist/lib/shader-assembly/wgsl-binding-scan.js +151 -0
- package/dist/lib/shader-assembly/wgsl-binding-scan.js.map +1 -0
- package/dist/lib/shader-generator/glsl/generate-glsl.js +7 -4
- package/dist/lib/shader-generator/glsl/generate-glsl.js.map +1 -1
- package/dist/lib/shader-generator/wgsl/generate-wgsl.d.ts.map +1 -1
- package/dist/lib/shader-generator/wgsl/generate-wgsl.js +3 -0
- package/dist/lib/shader-generator/wgsl/generate-wgsl.js.map +1 -1
- package/dist/lib/shader-module/shader-module-uniform-layout.d.ts +91 -0
- package/dist/lib/shader-module/shader-module-uniform-layout.d.ts.map +1 -0
- package/dist/lib/shader-module/shader-module-uniform-layout.js +253 -0
- package/dist/lib/shader-module/shader-module-uniform-layout.js.map +1 -0
- package/dist/lib/shader-module/shader-module.d.ts +12 -6
- package/dist/lib/shader-module/shader-module.d.ts.map +1 -1
- package/dist/lib/shader-module/shader-module.js.map +1 -1
- package/dist/lib/utils/assert.d.ts.map +1 -1
- package/dist/lib/utils/assert.js +3 -1
- package/dist/lib/utils/assert.js.map +1 -1
- package/dist/lib/utils/uniform-types.d.ts +11 -7
- package/dist/lib/utils/uniform-types.d.ts.map +1 -1
- package/dist/modules/engine/picking/picking.d.ts +5 -2
- package/dist/modules/engine/picking/picking.d.ts.map +1 -1
- package/dist/modules/engine/picking/picking.js +5 -2
- package/dist/modules/engine/picking/picking.js.map +1 -1
- package/dist/modules/engine/project/project.d.ts +1 -1
- package/dist/modules/engine/project/project.js +1 -1
- package/dist/modules/engine/skin/skin.d.ts +30 -0
- package/dist/modules/engine/skin/skin.d.ts.map +1 -0
- package/dist/modules/engine/skin/skin.js +86 -0
- package/dist/modules/engine/skin/skin.js.map +1 -0
- package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts +1 -0
- package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts.map +1 -1
- package/dist/modules/lighting/gouraud-material/gouraud-material.js +3 -0
- package/dist/modules/lighting/gouraud-material/gouraud-material.js.map +1 -1
- package/dist/modules/lighting/ibl/ibl.d.ts +26 -0
- package/dist/modules/lighting/ibl/ibl.d.ts.map +1 -0
- package/dist/modules/lighting/ibl/ibl.js +33 -0
- package/dist/modules/lighting/ibl/ibl.js.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-material.d.ts +10 -0
- package/dist/modules/lighting/lambert-material/lambert-material.d.ts.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-material.js +33 -0
- package/dist/modules/lighting/lambert-material/lambert-material.js.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.d.ts +3 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.d.ts.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.js +60 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.js.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-wgsl.d.ts +2 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-wgsl.d.ts.map +1 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-wgsl.js +73 -0
- package/dist/modules/lighting/lambert-material/lambert-shaders-wgsl.js.map +1 -0
- package/dist/modules/lighting/lights/lighting-glsl.d.ts +1 -1
- package/dist/modules/lighting/lights/lighting-glsl.d.ts.map +1 -1
- package/dist/modules/lighting/lights/lighting-glsl.js +44 -38
- package/dist/modules/lighting/lights/lighting-glsl.js.map +1 -1
- package/dist/modules/lighting/lights/lighting-wgsl.d.ts +1 -1
- package/dist/modules/lighting/lights/lighting-wgsl.d.ts.map +1 -1
- package/dist/modules/lighting/lights/lighting-wgsl.js +46 -18
- package/dist/modules/lighting/lights/lighting-wgsl.js.map +1 -1
- package/dist/modules/lighting/lights/lighting.d.ts +104 -62
- package/dist/modules/lighting/lights/lighting.d.ts.map +1 -1
- package/dist/modules/lighting/lights/lighting.js +107 -68
- package/dist/modules/lighting/lights/lighting.js.map +1 -1
- package/dist/modules/lighting/no-material/dirlight.d.ts +8 -3
- package/dist/modules/lighting/no-material/dirlight.d.ts.map +1 -1
- package/dist/modules/lighting/no-material/dirlight.js +5 -3
- package/dist/modules/lighting/no-material/dirlight.js.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material-glsl.d.ts +2 -2
- package/dist/modules/lighting/pbr-material/pbr-material-glsl.d.ts.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material-glsl.js +694 -38
- package/dist/modules/lighting/pbr-material/pbr-material-glsl.js.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material-wgsl.d.ts +2 -2
- package/dist/modules/lighting/pbr-material/pbr-material-wgsl.d.ts.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material-wgsl.js +956 -109
- package/dist/modules/lighting/pbr-material/pbr-material-wgsl.js.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material.d.ts +242 -43
- package/dist/modules/lighting/pbr-material/pbr-material.d.ts.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-material.js +178 -2
- package/dist/modules/lighting/pbr-material/pbr-material.js.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-projection.d.ts.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-projection.js +14 -2
- package/dist/modules/lighting/pbr-material/pbr-projection.js.map +1 -1
- package/dist/modules/lighting/pbr-material/pbr-scene.d.ts +40 -0
- package/dist/modules/lighting/pbr-material/pbr-scene.d.ts.map +1 -0
- package/dist/modules/lighting/pbr-material/pbr-scene.js +67 -0
- package/dist/modules/lighting/pbr-material/pbr-scene.js.map +1 -0
- package/dist/modules/lighting/phong-material/phong-material.d.ts +1 -0
- package/dist/modules/lighting/phong-material/phong-material.d.ts.map +1 -1
- package/dist/modules/lighting/phong-material/phong-material.js +4 -0
- package/dist/modules/lighting/phong-material/phong-material.js.map +1 -1
- package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts +2 -2
- package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts.map +1 -1
- package/dist/modules/lighting/phong-material/phong-shaders-glsl.js +17 -6
- package/dist/modules/lighting/phong-material/phong-shaders-glsl.js.map +1 -1
- package/dist/modules/lighting/phong-material/phong-shaders-wgsl.d.ts +1 -40
- package/dist/modules/lighting/phong-material/phong-shaders-wgsl.d.ts.map +1 -1
- package/dist/modules/lighting/phong-material/phong-shaders-wgsl.js +71 -76
- package/dist/modules/lighting/phong-material/phong-shaders-wgsl.js.map +1 -1
- package/dist/modules/math/fp64/fp64-arithmetic-glsl.d.ts +1 -1
- package/dist/modules/math/fp64/fp64-arithmetic-glsl.d.ts.map +1 -1
- package/dist/modules/math/fp64/fp64-arithmetic-glsl.js +42 -11
- package/dist/modules/math/fp64/fp64-arithmetic-glsl.js.map +1 -1
- package/dist/modules/math/fp64/fp64-arithmetic-wgsl.d.ts +2 -0
- package/dist/modules/math/fp64/fp64-arithmetic-wgsl.d.ts.map +1 -0
- package/dist/modules/math/fp64/fp64-arithmetic-wgsl.js +212 -0
- package/dist/modules/math/fp64/fp64-arithmetic-wgsl.js.map +1 -0
- package/dist/modules/math/fp64/fp64.d.ts +1 -0
- package/dist/modules/math/fp64/fp64.d.ts.map +1 -1
- package/dist/modules/math/fp64/fp64.js +8 -2
- package/dist/modules/math/fp64/fp64.js.map +1 -1
- package/dist/modules/math/random/random.d.ts +1 -1
- package/dist/modules/math/random/random.d.ts.map +1 -1
- package/dist/modules/math/random/random.js +2 -3
- package/dist/modules/math/random/random.js.map +1 -1
- package/package.json +4 -5
- package/src/index.ts +37 -6
- package/src/lib/glsl-utils/shader-utils.ts +4 -4
- package/src/lib/preprocessor/preprocessor.ts +44 -8
- package/src/lib/shader-assembler.ts +25 -3
- package/src/lib/shader-assembly/assemble-shaders.ts +506 -13
- package/src/lib/shader-assembly/wgsl-binding-debug.ts +227 -0
- package/src/lib/shader-assembly/wgsl-binding-scan.ts +228 -0
- package/src/lib/shader-generator/glsl/generate-glsl.ts +11 -5
- package/src/lib/shader-generator/wgsl/generate-wgsl.ts +6 -0
- package/src/lib/shader-module/shader-module-uniform-layout.ts +420 -0
- package/src/lib/shader-module/shader-module.ts +17 -7
- package/src/lib/utils/assert.ts +3 -1
- package/src/lib/utils/uniform-types.ts +24 -9
- package/src/modules/engine/picking/picking.ts +5 -2
- package/src/modules/engine/project/project.ts +1 -1
- package/src/modules/engine/skin/skin.ts +114 -0
- package/src/modules/lighting/gouraud-material/gouraud-material.ts +4 -0
- package/src/modules/lighting/ibl/ibl.ts +44 -0
- package/src/modules/lighting/lambert-material/lambert-material.ts +42 -0
- package/src/modules/lighting/lambert-material/lambert-shaders-glsl.ts +61 -0
- package/src/modules/lighting/lambert-material/lambert-shaders-wgsl.ts +73 -0
- package/src/modules/lighting/lights/lighting-glsl.ts +44 -38
- package/src/modules/lighting/lights/lighting-wgsl.ts +46 -18
- package/src/modules/lighting/lights/lighting.ts +198 -99
- package/src/modules/lighting/no-material/dirlight.ts +5 -3
- package/src/modules/lighting/pbr-material/pbr-material-glsl.ts +694 -38
- package/src/modules/lighting/pbr-material/pbr-material-wgsl.ts +956 -109
- package/src/modules/lighting/pbr-material/pbr-material.ts +294 -7
- package/src/modules/lighting/pbr-material/pbr-projection.ts +15 -2
- package/src/modules/lighting/pbr-material/pbr-scene.ts +91 -0
- package/src/modules/lighting/phong-material/phong-material.ts +5 -0
- package/src/modules/lighting/phong-material/phong-shaders-glsl.ts +17 -6
- package/src/modules/lighting/phong-material/phong-shaders-wgsl.ts +71 -77
- package/src/modules/math/fp64/fp64-arithmetic-glsl.ts +42 -11
- package/src/modules/math/fp64/fp64-arithmetic-wgsl.ts +212 -0
- package/src/modules/math/fp64/fp64.ts +9 -3
- package/src/modules/math/random/random.ts +2 -3
- package/dist/lib/wgsl/get-shader-layout-wgsl.d.ts +0 -8
- package/dist/lib/wgsl/get-shader-layout-wgsl.d.ts.map +0 -1
- package/dist/lib/wgsl/get-shader-layout-wgsl.js +0 -95
- package/dist/lib/wgsl/get-shader-layout-wgsl.js.map +0 -1
- package/src/lib/wgsl/get-shader-layout-wgsl.ts +0 -105
package/dist/index.d.ts
CHANGED
|
@@ -3,13 +3,16 @@
|
|
|
3
3
|
* Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
|
|
4
4
|
*/
|
|
5
5
|
export type { PlatformInfo } from "./lib/shader-assembly/platform-info.js";
|
|
6
|
+
export type { ShaderBindingDebugRow } from "./lib/shader-assembly/wgsl-binding-debug.js";
|
|
6
7
|
export type { ShaderModule } from "./lib/shader-module/shader-module.js";
|
|
7
8
|
export type { ShaderPass } from "./lib/shader-module/shader-pass.js";
|
|
8
|
-
export type { UniformTypes } from "./lib/utils/uniform-types.js";
|
|
9
|
+
export type { ShaderModuleUniformValue, UniformTypes } from "./lib/utils/uniform-types.js";
|
|
9
10
|
export { initializeShaderModule, initializeShaderModules } from "./lib/shader-module/shader-module.js";
|
|
10
11
|
export { getShaderModuleUniforms } from "./lib/shader-module/shader-module.js";
|
|
11
12
|
export { getShaderModuleDependencies } from "./lib/shader-module/shader-module-dependencies.js";
|
|
12
13
|
export { checkShaderModuleDeprecations } from "./lib/shader-module/shader-module.js";
|
|
14
|
+
export type { GLSLUniformBlockInfo, ShaderModuleUniformLayoutStage, ShaderModuleUniformLayoutValidationResult } from "./lib/shader-module/shader-module-uniform-layout.js";
|
|
15
|
+
export { getGLSLUniformBlocks, getShaderModuleUniformBlockFields, getShaderModuleUniformBlockName, getShaderModuleUniformLayoutValidationResult, validateShaderModuleUniformLayout, warnIfGLSLUniformBlocksAreNotStd140 } from "./lib/shader-module/shader-module-uniform-layout.js";
|
|
13
16
|
export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
|
|
14
17
|
export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
|
|
15
18
|
export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
|
|
@@ -24,7 +27,6 @@ export { capitalize } from "./lib/shader-generator/utils/capitalize.js";
|
|
|
24
27
|
export { preprocess } from "./lib/preprocessor/preprocessor.js";
|
|
25
28
|
export { assembleGLSLShaderPair } from "./lib/shader-assembly/assemble-shaders.js";
|
|
26
29
|
export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
|
|
27
|
-
export { getShaderLayoutFromWGSL } from "./lib/wgsl/get-shader-layout-wgsl.js";
|
|
28
30
|
export { toHalfFloat, fromHalfFloat } from "./modules/math/fp16/fp16-utils.js";
|
|
29
31
|
export { fp64ify, fp64LowPart, fp64ifyMatrix4 } from "./modules/math/fp64/fp64-utils.js";
|
|
30
32
|
export { random } from "./modules/math/random/random.js";
|
|
@@ -32,14 +34,22 @@ export { fp32 } from "./modules/math/fp32/fp32.js";
|
|
|
32
34
|
export { fp64, fp64arithmetic } from "./modules/math/fp64/fp64.js";
|
|
33
35
|
export type { PickingProps, PickingUniforms } from "./modules/engine/picking/picking.js";
|
|
34
36
|
export { picking } from "./modules/engine/picking/picking.js";
|
|
37
|
+
export { skin } from "./modules/engine/skin/skin.js";
|
|
38
|
+
export { type Light, type AmbientLight, type PointLight, type SpotLight, type DirectionalLight, type LightingLightUniform } from "./modules/lighting/lights/lighting.js";
|
|
35
39
|
export type { LightingProps, LightingUniforms } from "./modules/lighting/lights/lighting.js";
|
|
36
40
|
export { lighting } from "./modules/lighting/lights/lighting.js";
|
|
41
|
+
export type { IBLBindings } from "./modules/lighting/ibl/ibl.js";
|
|
42
|
+
export { ibl } from "./modules/lighting/ibl/ibl.js";
|
|
37
43
|
export { dirlight } from "./modules/lighting/no-material/dirlight.js";
|
|
44
|
+
export type { LambertMaterialProps } from "./modules/lighting/lambert-material/lambert-material.js";
|
|
45
|
+
export { lambertMaterial } from "./modules/lighting/lambert-material/lambert-material.js";
|
|
38
46
|
export type { GouraudMaterialProps } from "./modules/lighting/gouraud-material/gouraud-material.js";
|
|
39
47
|
export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
|
|
40
48
|
export type { PhongMaterialProps } from "./modules/lighting/phong-material/phong-material.js";
|
|
41
49
|
export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
|
|
42
50
|
export type { PBRMaterialBindings, PBRMaterialProps, PBRMaterialUniforms } from "./modules/lighting/pbr-material/pbr-material.js";
|
|
51
|
+
export type { PBRSceneBindings, PBRSceneProps, PBRSceneUniforms } from "./modules/lighting/pbr-material/pbr-scene.js";
|
|
43
52
|
export type { PBRProjectionProps } from "./modules/lighting/pbr-material/pbr-projection.js";
|
|
44
53
|
export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
|
|
54
|
+
export { pbrScene } from "./modules/lighting/pbr-material/pbr-scene.js";
|
|
45
55
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,YAAY,EAAC,YAAY,EAAC,+CAA4C;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -5,6 +5,7 @@ export { initializeShaderModule, initializeShaderModules } from "./lib/shader-mo
|
|
|
5
5
|
export { getShaderModuleUniforms } from "./lib/shader-module/shader-module.js";
|
|
6
6
|
export { getShaderModuleDependencies } from "./lib/shader-module/shader-module-dependencies.js";
|
|
7
7
|
export { checkShaderModuleDeprecations } from "./lib/shader-module/shader-module.js";
|
|
8
|
+
export { getGLSLUniformBlocks, getShaderModuleUniformBlockFields, getShaderModuleUniformBlockName, getShaderModuleUniformLayoutValidationResult, validateShaderModuleUniformLayout, warnIfGLSLUniformBlocksAreNotStd140 } from "./lib/shader-module/shader-module-uniform-layout.js";
|
|
8
9
|
export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
|
|
9
10
|
export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
|
|
10
11
|
export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
|
|
@@ -20,8 +21,6 @@ export { capitalize } from "./lib/shader-generator/utils/capitalize.js";
|
|
|
20
21
|
export { preprocess } from "./lib/preprocessor/preprocessor.js";
|
|
21
22
|
export { assembleGLSLShaderPair } from "./lib/shader-assembly/assemble-shaders.js";
|
|
22
23
|
export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
|
|
23
|
-
// EXPERIMENTAL WGSL
|
|
24
|
-
export { getShaderLayoutFromWGSL } from "./lib/wgsl/get-shader-layout-wgsl.js";
|
|
25
24
|
// data utils
|
|
26
25
|
export { toHalfFloat, fromHalfFloat } from "./modules/math/fp16/fp16-utils.js";
|
|
27
26
|
export { fp64ify, fp64LowPart, fp64ifyMatrix4 } from "./modules/math/fp64/fp64-utils.js";
|
|
@@ -30,9 +29,13 @@ export { random } from "./modules/math/random/random.js";
|
|
|
30
29
|
export { fp32 } from "./modules/math/fp32/fp32.js";
|
|
31
30
|
export { fp64, fp64arithmetic } from "./modules/math/fp64/fp64.js";
|
|
32
31
|
export { picking } from "./modules/engine/picking/picking.js";
|
|
32
|
+
export { skin } from "./modules/engine/skin/skin.js";
|
|
33
33
|
export { lighting } from "./modules/lighting/lights/lighting.js";
|
|
34
|
+
export { ibl } from "./modules/lighting/ibl/ibl.js";
|
|
34
35
|
export { dirlight } from "./modules/lighting/no-material/dirlight.js";
|
|
36
|
+
export { lambertMaterial } from "./modules/lighting/lambert-material/lambert-material.js";
|
|
35
37
|
export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
|
|
36
38
|
export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
|
|
37
39
|
export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
|
|
40
|
+
export { pbrScene } from "./modules/lighting/pbr-material/pbr-scene.js";
|
|
38
41
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAiBpC,OAAO,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,6CAA0C;AAClG,OAAO,EAAC,uBAAuB,EAAC,6CAA0C;AAC1E,OAAO,EAAC,2BAA2B,EAAC,0DAAuD;AAC3F,OAAO,EAAC,6BAA6B,EAAC,6CAA0C;AAMhF,OAAO,EACL,oBAAoB,EACpB,iCAAiC,EACjC,+BAA+B,EAC/B,4CAA4C,EAC5C,iCAAiC,EACjC,mCAAmC,EACpC,4DAAyD;AAE1D,OAAO,EAAC,qBAAqB,EAAC,kDAA+C;AAE7E,OAAO,EAAC,cAAc,IAAI,eAAe,EAAC,0DAAuD;AACjG,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,0DAAuD;AAEzG,kBAAkB;AAClB,OAAO,EAAC,eAAe,EAAC,kCAA+B;AAIvD,iBAAiB;AAEjB,8BAA8B;AAC9B,OAAO,EAAC,aAAa,EAAC,4CAAyC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACd,yCAAsC;AAIvC,OAAO,EAAC,uBAAuB,EAAC,kDAA+C;AAC/E,OAAO,EAAC,UAAU,EAAC,mDAAgD;AAEnE,uDAAuD;AACvD,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAC3D,OAAO,EAAC,sBAAsB,EAAC,kDAA+C;AAC9E,OAAO,EAAC,cAAc,EAAC,mDAAgD;AAEvE,aAAa;AACb,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAC,0CAAuC;AAEpF,iBAAiB;AACjB,OAAO,EAAC,MAAM,EAAC,wCAAqC;AAEpD,OAAO,EAAC,IAAI,EAAC,oCAAiC;AAC9C,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,oCAAiC;AAQ9D,OAAO,EAAC,OAAO,EAAC,4CAAyC;AACzD,OAAO,EAAC,IAAI,EAAC,sCAAmC;AAahD,OAAO,EAAC,QAAQ,EAAC,8CAA2C;AAE5D,OAAO,EAAC,GAAG,EAAC,sCAAmC;AAC/C,OAAO,EAAC,QAAQ,EAAC,mDAAgD;AAEjE,OAAO,EAAC,eAAe,EAAC,gEAA6D;AAErF,OAAO,EAAC,eAAe,EAAC,gEAA6D;AAErF,OAAO,EAAC,aAAa,EAAC,4DAAyD;AAa/E,OAAO,EAAC,WAAW,EAAC,wDAAqD;AACzE,OAAO,EAAC,QAAQ,EAAC,qDAAkD"}
|
|
@@ -44,7 +44,7 @@ void main() {
|
|
|
44
44
|
}
|
|
45
45
|
/** convert glsl type to suffix */
|
|
46
46
|
export function typeToChannelSuffix(type) {
|
|
47
|
-
//
|
|
47
|
+
// biome-ignore format: preserve layout
|
|
48
48
|
switch (type) {
|
|
49
49
|
case 'float': return 'x';
|
|
50
50
|
case 'vec2': return 'xy';
|
|
@@ -56,7 +56,7 @@ export function typeToChannelSuffix(type) {
|
|
|
56
56
|
}
|
|
57
57
|
/** convert glsl type to channel count */
|
|
58
58
|
export function typeToChannelCount(type) {
|
|
59
|
-
//
|
|
59
|
+
// biome-ignore format: preserve layout
|
|
60
60
|
switch (type) {
|
|
61
61
|
case 'float': return 1;
|
|
62
62
|
case 'vec2': return 2;
|
|
@@ -67,7 +67,7 @@ export function typeToChannelCount(type) {
|
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
function channelCountToType(channels) {
|
|
70
|
-
//
|
|
70
|
+
// biome-ignore format: preserve layout
|
|
71
71
|
switch (channels) {
|
|
72
72
|
case 1: return 'float';
|
|
73
73
|
case 2: return 'vec2';
|
|
@@ -79,7 +79,7 @@ function channelCountToType(channels) {
|
|
|
79
79
|
}
|
|
80
80
|
/** Returns glsl instruction for converting to vec4 */
|
|
81
81
|
export function convertToVec4(variable, channels) {
|
|
82
|
-
//
|
|
82
|
+
// biome-ignore format: preserve layout
|
|
83
83
|
switch (channels) {
|
|
84
84
|
case 1: return `vec4(${variable}, 0.0, 0.0, 1.0)`;
|
|
85
85
|
case 2: return `vec4(${variable}, 0.0, 1.0)`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-utils.js","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,OAAO,GAAG,UAAU,CAAC;;;;EAIzB,CAAC;AACH,MAAM,KAAK,GAAG,oBAAoB,OAAO,EAAE,CAAC;AAQ5C,6DAA6D;AAC7D,MAAM,UAAU,mBAAmB,CACjC,IAAY,EACZ,UAA6B;IAE7B,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpD,uEAAuE;IACvE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;IAC5C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,OAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAIhC;IACC,MAAM,EAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAC,GAAG,OAAO,IAAI,EAAE,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,iBAAiB;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,SAAS,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACxD,OAAO;;KAEJ,SAAS,IAAI,KAAK;WACZ,MAAM;;IAEb,MAAM,MAAM,WAAW;EACzB,CAAC;AACH,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,
|
|
1
|
+
{"version":3,"file":"shader-utils.js","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocessor.d.ts","sourceRoot":"","sources":["../../../src/lib/preprocessor/preprocessor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preprocessor.d.ts","sourceRoot":"","sources":["../../../src/lib/preprocessor/preprocessor.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AAEF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAgDhF"}
|
|
@@ -1,27 +1,54 @@
|
|
|
1
1
|
// luma.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
const
|
|
4
|
+
const DEFINE_NAME_PATTERN = '([a-zA-Z_][a-zA-Z0-9_]*)';
|
|
5
|
+
const IFDEF_REGEXP = new RegExp(`^\\s*\\#\\s*ifdef\\s*${DEFINE_NAME_PATTERN}\\s*$`);
|
|
6
|
+
const IFNDEF_REGEXP = new RegExp(`^\\s*\\#\\s*ifndef\\s*${DEFINE_NAME_PATTERN}\\s*(?:\\/\\/.*)?$`);
|
|
7
|
+
const ELSE_REGEXP = /^\s*\#\s*else\s*(?:\/\/.*)?$/;
|
|
5
8
|
const ENDIF_REGEXP = /^\s*\#\s*endif\s*$/;
|
|
9
|
+
const IFDEF_WITH_COMMENT_REGEXP = new RegExp(`^\\s*\\#\\s*ifdef\\s*${DEFINE_NAME_PATTERN}\\s*(?:\\/\\/.*)?$`);
|
|
10
|
+
const ENDIF_WITH_COMMENT_REGEXP = /^\s*\#\s*endif\s*(?:\/\/.*)?$/;
|
|
6
11
|
export function preprocess(source, options) {
|
|
7
12
|
const lines = source.split('\n');
|
|
8
13
|
const output = [];
|
|
14
|
+
const conditionalStack = [];
|
|
9
15
|
let conditional = true;
|
|
10
|
-
let currentDefine = null;
|
|
11
16
|
for (const line of lines) {
|
|
12
|
-
const matchIf = line.match(IFDEF_REGEXP);
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
+
const matchIf = line.match(IFDEF_WITH_COMMENT_REGEXP) || line.match(IFDEF_REGEXP);
|
|
18
|
+
const matchIfNot = line.match(IFNDEF_REGEXP);
|
|
19
|
+
const matchElse = line.match(ELSE_REGEXP);
|
|
20
|
+
const matchEnd = line.match(ENDIF_WITH_COMMENT_REGEXP) || line.match(ENDIF_REGEXP);
|
|
21
|
+
if (matchIf || matchIfNot) {
|
|
22
|
+
const defineName = (matchIf || matchIfNot)?.[1];
|
|
23
|
+
const defineValue = Boolean(options?.defines?.[defineName]);
|
|
24
|
+
const branchTaken = matchIf ? defineValue : !defineValue;
|
|
25
|
+
const active = conditional && branchTaken;
|
|
26
|
+
conditionalStack.push({ parentActive: conditional, branchTaken, active });
|
|
27
|
+
conditional = active;
|
|
28
|
+
}
|
|
29
|
+
else if (matchElse) {
|
|
30
|
+
const currentConditional = conditionalStack[conditionalStack.length - 1];
|
|
31
|
+
if (!currentConditional) {
|
|
32
|
+
throw new Error('Encountered #else without matching #ifdef or #ifndef');
|
|
33
|
+
}
|
|
34
|
+
currentConditional.active =
|
|
35
|
+
currentConditional.parentActive && !currentConditional.branchTaken;
|
|
36
|
+
currentConditional.branchTaken = true;
|
|
37
|
+
conditional = currentConditional.active;
|
|
17
38
|
}
|
|
18
39
|
else if (matchEnd) {
|
|
19
|
-
|
|
40
|
+
conditionalStack.pop();
|
|
41
|
+
conditional = conditionalStack.length
|
|
42
|
+
? conditionalStack[conditionalStack.length - 1].active
|
|
43
|
+
: true;
|
|
20
44
|
}
|
|
21
45
|
else if (conditional) {
|
|
22
46
|
output.push(line);
|
|
23
47
|
}
|
|
24
48
|
}
|
|
49
|
+
if (conditionalStack.length > 0) {
|
|
50
|
+
throw new Error('Unterminated conditional block in shader source');
|
|
51
|
+
}
|
|
25
52
|
return output.join('\n');
|
|
26
53
|
}
|
|
27
54
|
//# sourceMappingURL=preprocessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../src/lib/preprocessor/preprocessor.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../src/lib/preprocessor/preprocessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ShaderModule } from "./shader-module/shader-module.js";
|
|
2
2
|
import { AssembleShaderProps, GetUniformsFunc } from "./shader-assembly/assemble-shaders.js";
|
|
3
|
+
import { type ShaderBindingDebugRow } from "./shader-assembly/wgsl-binding-debug.js";
|
|
3
4
|
/**
|
|
4
5
|
* A stateful version of `assembleShaders` that can be used to assemble shaders.
|
|
5
6
|
* Supports setting of default modules and hooks.
|
|
@@ -11,6 +12,8 @@ export declare class ShaderAssembler {
|
|
|
11
12
|
private readonly _hookFunctions;
|
|
12
13
|
/** Shader modules */
|
|
13
14
|
private _defaultModules;
|
|
15
|
+
/** Stable per-run WGSL auto-binding assignments keyed by group/module/binding. */
|
|
16
|
+
private readonly _wgslBindingRegistry;
|
|
14
17
|
/**
|
|
15
18
|
* A default shader assembler instance - the natural place to register default modules and hooks
|
|
16
19
|
* @returns
|
|
@@ -40,6 +43,13 @@ export declare class ShaderAssembler {
|
|
|
40
43
|
source: string;
|
|
41
44
|
getUniforms: GetUniformsFunc;
|
|
42
45
|
modules: ShaderModule[];
|
|
46
|
+
bindingAssignments: {
|
|
47
|
+
moduleName: string;
|
|
48
|
+
name: string;
|
|
49
|
+
group: number;
|
|
50
|
+
location: number;
|
|
51
|
+
}[];
|
|
52
|
+
bindingTable: ShaderBindingDebugRow[];
|
|
43
53
|
};
|
|
44
54
|
/**
|
|
45
55
|
* Assemble a pair of shaders into a single shader program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-assembler.d.ts","sourceRoot":"","sources":["../../src/lib/shader-assembler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,yCAAsC;AAEhE,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGhB,8CAA2C;
|
|
1
|
+
{"version":3,"file":"shader-assembler.d.ts","sourceRoot":"","sources":["../../src/lib/shader-assembler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,yCAAsC;AAEhE,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGhB,8CAA2C;AAC5C,OAAO,EAEL,KAAK,qBAAqB,EAC3B,gDAA6C;AAG9C;;;GAGG;AACH,qBAAa,eAAe;IAC1B,uCAAuC;IACvC,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;IAC/C,qBAAqB;IACrB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAa;IAC5C,qBAAqB;IACrB,OAAO,CAAC,eAAe,CAAsB;IAC7C,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE;;;OAGG;IACH,MAAM,CAAC,yBAAyB,IAAI,eAAe;IAMnD;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAU5C;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAK/C;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAO7C;;;;;OAKG;IACH,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,GAAG;QAC9C,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,eAAe,CAAC;QAC7B,OAAO,EAAE,YAAY,EAAE,CAAC;QACxB,kBAAkB,EAAE;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAC,EAAE,CAAC;QAC1F,YAAY,EAAE,qBAAqB,EAAE,CAAC;KACvC;IA8BD;;;;;OAKG;IACH,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,GAAG;QAClD,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,WAAW,EAAE,eAAe,CAAC;QAC7B,OAAO,EAAE,YAAY,EAAE,CAAC;KACzB;IAgBD;;OAEG;IACH,cAAc,CAAC,UAAU,GAAE,YAAY,EAAO,GAAG,YAAY,EAAE;CA0BhE"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { initializeShaderModules } from "./shader-module/shader-module.js";
|
|
5
5
|
import { assembleWGSLShader, assembleGLSLShaderPair } from "./shader-assembly/assemble-shaders.js";
|
|
6
|
+
import { getShaderBindingDebugRowsFromWGSL } from "./shader-assembly/wgsl-binding-debug.js";
|
|
6
7
|
import { preprocess } from "./preprocessor/preprocessor.js";
|
|
7
8
|
/**
|
|
8
9
|
* A stateful version of `assembleShaders` that can be used to assemble shaders.
|
|
@@ -15,6 +16,8 @@ export class ShaderAssembler {
|
|
|
15
16
|
_hookFunctions = [];
|
|
16
17
|
/** Shader modules */
|
|
17
18
|
_defaultModules = [];
|
|
19
|
+
/** Stable per-run WGSL auto-binding assignments keyed by group/module/binding. */
|
|
20
|
+
_wgslBindingRegistry = new Map();
|
|
18
21
|
/**
|
|
19
22
|
* A default shader assembler instance - the natural place to register default modules and hooks
|
|
20
23
|
* @returns
|
|
@@ -59,16 +62,30 @@ export class ShaderAssembler {
|
|
|
59
62
|
assembleWGSLShader(props) {
|
|
60
63
|
const modules = this._getModuleList(props.modules); // Combine with default modules
|
|
61
64
|
const hookFunctions = this._hookFunctions; // TODO - combine with default hook functions
|
|
62
|
-
const { source, getUniforms } = assembleWGSLShader({
|
|
65
|
+
const { source, getUniforms, bindingAssignments } = assembleWGSLShader({
|
|
63
66
|
...props,
|
|
64
67
|
// @ts-expect-error
|
|
65
68
|
source: props.source,
|
|
69
|
+
_bindingRegistry: this._wgslBindingRegistry,
|
|
66
70
|
modules,
|
|
67
71
|
hookFunctions
|
|
68
72
|
});
|
|
73
|
+
const defines = {
|
|
74
|
+
...modules.reduce((accumulator, module) => {
|
|
75
|
+
Object.assign(accumulator, module.defines);
|
|
76
|
+
return accumulator;
|
|
77
|
+
}, {}),
|
|
78
|
+
...props.defines
|
|
79
|
+
};
|
|
69
80
|
// WGSL does not have built-in preprocessing support (just compile time constants)
|
|
70
|
-
const preprocessedSource = props.platformInfo.shaderLanguage === 'wgsl' ? preprocess(source) : source;
|
|
71
|
-
return {
|
|
81
|
+
const preprocessedSource = props.platformInfo.shaderLanguage === 'wgsl' ? preprocess(source, { defines }) : source;
|
|
82
|
+
return {
|
|
83
|
+
source: preprocessedSource,
|
|
84
|
+
getUniforms,
|
|
85
|
+
modules,
|
|
86
|
+
bindingAssignments,
|
|
87
|
+
bindingTable: getShaderBindingDebugRowsFromWGSL(preprocessedSource, bindingAssignments)
|
|
88
|
+
};
|
|
72
89
|
}
|
|
73
90
|
/**
|
|
74
91
|
* Assemble a pair of shaders into a single shader program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-assembler.js","sourceRoot":"","sources":["../../src/lib/shader-assembler.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,uBAAuB,EAAC,yCAAsC;AACtE,OAAO,EAGL,kBAAkB,EAClB,sBAAsB,EACvB,8CAA2C;AAC5C,OAAO,EAAC,UAAU,EAAC,uCAAoC;AAEvD;;;GAGG;AACH,MAAM,OAAO,eAAe;IAC1B,uCAAuC;IACvC,MAAM,CAAC,sBAAsB,CAAkB;IAC/C,qBAAqB;IACJ,cAAc,GAAU,EAAE,CAAC;IAC5C,qBAAqB;IACb,eAAe,GAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"shader-assembler.js","sourceRoot":"","sources":["../../src/lib/shader-assembler.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,uBAAuB,EAAC,yCAAsC;AACtE,OAAO,EAGL,kBAAkB,EAClB,sBAAsB,EACvB,8CAA2C;AAC5C,OAAO,EACL,iCAAiC,EAElC,gDAA6C;AAC9C,OAAO,EAAC,UAAU,EAAC,uCAAoC;AAEvD;;;GAGG;AACH,MAAM,OAAO,eAAe;IAC1B,uCAAuC;IACvC,MAAM,CAAC,sBAAsB,CAAkB;IAC/C,qBAAqB;IACJ,cAAc,GAAU,EAAE,CAAC;IAC5C,qBAAqB;IACb,eAAe,GAAmB,EAAE,CAAC;IAC7C,kFAAkF;IACjE,oBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAElE;;;OAGG;IACH,MAAM,CAAC,yBAAyB;QAC9B,eAAe,CAAC,sBAAsB;YACpC,eAAe,CAAC,sBAAsB,IAAI,IAAI,eAAe,EAAE,CAAC;QAClE,OAAO,eAAe,CAAC,sBAAsB,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,MAAoB;QACnC,IACE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACpE,EACD,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,MAAoB;QACtC,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QACrE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,IAAY,EAAE,IAAU;QACpC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACH,kBAAkB,CAAC,KAA0B;QAO3C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B;QACnF,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,6CAA6C;QACxF,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAC,GAAG,kBAAkB,CAAC;YACnE,GAAG,KAAK;YACR,mBAAmB;YACnB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO;YACP,aAAa;SACd,CAAC,CAAC;QACH,MAAM,OAAO,GAAG;YACd,GAAG,OAAO,CAAC,MAAM,CAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE;gBACjE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3C,OAAO,WAAW,CAAC;YACrB,CAAC,EAAE,EAAE,CAAC;YACN,GAAG,KAAK,CAAC,OAAO;SACjB,CAAC;QACF,kFAAkF;QAClF,MAAM,kBAAkB,GACtB,KAAK,CAAC,YAAY,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACxF,OAAO;YACL,MAAM,EAAE,kBAAkB;YAC1B,WAAW;YACX,OAAO;YACP,kBAAkB;YAClB,YAAY,EAAE,iCAAiC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;SACxF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,sBAAsB,CAAC,KAA0B;QAM/C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B;QACnF,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,6CAA6C;QACxF,MAAM,SAAS,GAAG,sBAAsB,CAAC;YACvC,GAAG,KAAK;YACR,mBAAmB;YACnB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,mBAAmB;YACnB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,OAAO;YACP,aAAa;SACd,CAAC,CAAC;QAEH,OAAO,EAAC,GAAG,SAAS,EAAE,OAAO,EAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,aAA6B,EAAE;QAC5C,MAAM,OAAO,GAAG,IAAI,KAAK,CAAe,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QACzF,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;YACtD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;QAEvB,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -2,6 +2,7 @@ import { PlatformInfo } from "./platform-info.js";
|
|
|
2
2
|
import type { ShaderInjection } from "./shader-injections.js";
|
|
3
3
|
import type { ShaderModule } from "../shader-module/shader-module.js";
|
|
4
4
|
import { ShaderHook } from "./shader-hooks.js";
|
|
5
|
+
import { type ShaderBindingDebugRow } from "./wgsl-binding-debug.js";
|
|
5
6
|
/**
|
|
6
7
|
* Options for `ShaderAssembler.assembleShaders()`
|
|
7
8
|
*/
|
|
@@ -54,6 +55,8 @@ type AssembleStageOptions = {
|
|
|
54
55
|
prologue?: boolean;
|
|
55
56
|
/** logger object */
|
|
56
57
|
log?: any;
|
|
58
|
+
/** @internal Stable per-assembler WGSL binding assignments. */
|
|
59
|
+
_bindingRegistry?: Map<string, number>;
|
|
57
60
|
};
|
|
58
61
|
export type HookFunction = {
|
|
59
62
|
hook: string;
|
|
@@ -71,9 +74,18 @@ export type GetUniformsFunc = (opts: Record<string, any>) => Record<string, any>
|
|
|
71
74
|
export declare function assembleWGSLShader(options: AssembleShaderOptions & {
|
|
72
75
|
/** Single WGSL shader */
|
|
73
76
|
source: string;
|
|
77
|
+
/** @internal Stable per-assembler WGSL binding assignments. */
|
|
78
|
+
_bindingRegistry?: Map<string, number>;
|
|
74
79
|
}): {
|
|
75
80
|
source: string;
|
|
76
81
|
getUniforms: GetUniformsFunc;
|
|
82
|
+
bindingAssignments: {
|
|
83
|
+
moduleName: string;
|
|
84
|
+
name: string;
|
|
85
|
+
group: number;
|
|
86
|
+
location: number;
|
|
87
|
+
}[];
|
|
88
|
+
bindingTable: ShaderBindingDebugRow[];
|
|
77
89
|
};
|
|
78
90
|
/**
|
|
79
91
|
* Injects dependent shader module sources into pair of main vertex/fragment shader sources for GLSL
|
|
@@ -95,7 +107,10 @@ export declare function assembleGLSLShaderPair(options: AssembleShaderOptions &
|
|
|
95
107
|
* @param options
|
|
96
108
|
* @returns
|
|
97
109
|
*/
|
|
98
|
-
export declare function assembleShaderWGSL(platformInfo: PlatformInfo, options: AssembleStageOptions):
|
|
110
|
+
export declare function assembleShaderWGSL(platformInfo: PlatformInfo, options: AssembleStageOptions): {
|
|
111
|
+
source: string;
|
|
112
|
+
bindingAssignments: WGSLBindingAssignment[];
|
|
113
|
+
};
|
|
99
114
|
/**
|
|
100
115
|
* Returns a combined `getUniforms` covering the options for all the modules,
|
|
101
116
|
* the created function will pass on options to the inidividual `getUniforms`
|
|
@@ -106,6 +121,12 @@ export declare function assembleShaderWGSL(platformInfo: PlatformInfo, options:
|
|
|
106
121
|
*/
|
|
107
122
|
export declare function assembleGetUniforms(modules: ShaderModule[]): (opts: Record<string, any>) => Record<string, any>;
|
|
108
123
|
/** Extracts the source code chunk for the specified shader type from the named shader module */
|
|
109
|
-
export declare function getShaderModuleSource(module: ShaderModule, stage: 'vertex' | 'fragment' | 'wgsl'): string;
|
|
124
|
+
export declare function getShaderModuleSource(module: ShaderModule, stage: 'vertex' | 'fragment' | 'wgsl', log?: any): string;
|
|
125
|
+
type WGSLBindingAssignment = {
|
|
126
|
+
moduleName: string;
|
|
127
|
+
name: string;
|
|
128
|
+
group: number;
|
|
129
|
+
location: number;
|
|
130
|
+
};
|
|
110
131
|
export {};
|
|
111
132
|
//# sourceMappingURL=assemble-shaders.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,2BAAwB;
|
|
1
|
+
{"version":3,"file":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}
|