@luma.gl/shadertools 9.3.0-alpha.9 → 9.3.1

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 (113) hide show
  1. package/dist/dist.dev.js +1018 -188
  2. package/dist/dist.min.js +440 -145
  3. package/dist/index.cjs +913 -172
  4. package/dist/index.cjs.map +4 -4
  5. package/dist/index.d.ts +7 -2
  6. package/dist/index.d.ts.map +1 -1
  7. package/dist/index.js +4 -1
  8. package/dist/index.js.map +1 -1
  9. package/dist/lib/color/normalize-byte-colors.d.ts +23 -0
  10. package/dist/lib/color/normalize-byte-colors.d.ts.map +1 -0
  11. package/dist/lib/color/normalize-byte-colors.js +42 -0
  12. package/dist/lib/color/normalize-byte-colors.js.map +1 -0
  13. package/dist/lib/glsl-utils/shader-utils.js +4 -4
  14. package/dist/lib/glsl-utils/shader-utils.js.map +1 -1
  15. package/dist/lib/shader-assembly/assemble-shaders.d.ts.map +1 -1
  16. package/dist/lib/shader-assembly/assemble-shaders.js +102 -49
  17. package/dist/lib/shader-assembly/assemble-shaders.js.map +1 -1
  18. package/dist/lib/shader-assembly/wgsl-binding-debug.d.ts.map +1 -1
  19. package/dist/lib/shader-assembly/wgsl-binding-debug.js +7 -3
  20. package/dist/lib/shader-assembly/wgsl-binding-debug.js.map +1 -1
  21. package/dist/lib/shader-assembly/wgsl-binding-scan.d.ts +19 -0
  22. package/dist/lib/shader-assembly/wgsl-binding-scan.d.ts.map +1 -0
  23. package/dist/lib/shader-assembly/wgsl-binding-scan.js +151 -0
  24. package/dist/lib/shader-assembly/wgsl-binding-scan.js.map +1 -0
  25. package/dist/lib/shader-generator/glsl/generate-glsl.js +4 -4
  26. package/dist/lib/shader-generator/glsl/generate-glsl.js.map +1 -1
  27. package/dist/lib/shader-module/shader-module-uniform-layout.d.ts +69 -0
  28. package/dist/lib/shader-module/shader-module-uniform-layout.d.ts.map +1 -1
  29. package/dist/lib/shader-module/shader-module-uniform-layout.js +143 -3
  30. package/dist/lib/shader-module/shader-module-uniform-layout.js.map +1 -1
  31. package/dist/modules/color/float-colors.d.ts +26 -0
  32. package/dist/modules/color/float-colors.d.ts.map +1 -0
  33. package/dist/modules/color/float-colors.js +82 -0
  34. package/dist/modules/color/float-colors.js.map +1 -0
  35. package/dist/modules/engine/picking/picking.d.ts +8 -8
  36. package/dist/modules/engine/picking/picking.d.ts.map +1 -1
  37. package/dist/modules/engine/picking/picking.js +13 -15
  38. package/dist/modules/engine/picking/picking.js.map +1 -1
  39. package/dist/modules/engine/project/project.d.ts +1 -1
  40. package/dist/modules/engine/project/project.js +1 -1
  41. package/dist/modules/engine/skin/skin.d.ts +2 -2
  42. package/dist/modules/engine/skin/skin.d.ts.map +1 -1
  43. package/dist/modules/engine/skin/skin.js +1 -1
  44. package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts +1 -0
  45. package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts.map +1 -1
  46. package/dist/modules/lighting/gouraud-material/gouraud-material.js +6 -3
  47. package/dist/modules/lighting/gouraud-material/gouraud-material.js.map +1 -1
  48. package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.d.ts +2 -2
  49. package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.d.ts.map +1 -1
  50. package/dist/modules/lighting/lambert-material/lambert-shaders-glsl.js +2 -2
  51. package/dist/modules/lighting/lights/lighting-glsl.d.ts +1 -1
  52. package/dist/modules/lighting/lights/lighting-glsl.d.ts.map +1 -1
  53. package/dist/modules/lighting/lights/lighting-glsl.js +1 -1
  54. package/dist/modules/lighting/lights/lighting.d.ts +4 -2
  55. package/dist/modules/lighting/lights/lighting.d.ts.map +1 -1
  56. package/dist/modules/lighting/lights/lighting.js +17 -11
  57. package/dist/modules/lighting/lights/lighting.js.map +1 -1
  58. package/dist/modules/lighting/no-material/dirlight.d.ts +3 -3
  59. package/dist/modules/lighting/no-material/dirlight.d.ts.map +1 -1
  60. package/dist/modules/lighting/no-material/dirlight.js +2 -2
  61. package/dist/modules/lighting/pbr-material/pbr-material-glsl.d.ts +2 -2
  62. package/dist/modules/lighting/pbr-material/pbr-material-glsl.d.ts.map +1 -1
  63. package/dist/modules/lighting/pbr-material/pbr-material-glsl.js +138 -35
  64. package/dist/modules/lighting/pbr-material/pbr-material-glsl.js.map +1 -1
  65. package/dist/modules/lighting/pbr-material/pbr-material-wgsl.d.ts +1 -1
  66. package/dist/modules/lighting/pbr-material/pbr-material-wgsl.d.ts.map +1 -1
  67. package/dist/modules/lighting/pbr-material/pbr-material-wgsl.js +139 -35
  68. package/dist/modules/lighting/pbr-material/pbr-material-wgsl.js.map +1 -1
  69. package/dist/modules/lighting/pbr-material/pbr-material.d.ts +74 -6
  70. package/dist/modules/lighting/pbr-material/pbr-material.d.ts.map +1 -1
  71. package/dist/modules/lighting/pbr-material/pbr-material.js +70 -2
  72. package/dist/modules/lighting/pbr-material/pbr-material.js.map +1 -1
  73. package/dist/modules/lighting/pbr-material/pbr-projection.js +1 -1
  74. package/dist/modules/lighting/pbr-material/pbr-scene.d.ts +40 -0
  75. package/dist/modules/lighting/pbr-material/pbr-scene.d.ts.map +1 -0
  76. package/dist/modules/lighting/pbr-material/pbr-scene.js +67 -0
  77. package/dist/modules/lighting/pbr-material/pbr-scene.js.map +1 -0
  78. package/dist/modules/lighting/phong-material/phong-material.d.ts +1 -0
  79. package/dist/modules/lighting/phong-material/phong-material.d.ts.map +1 -1
  80. package/dist/modules/lighting/phong-material/phong-material.js +6 -3
  81. package/dist/modules/lighting/phong-material/phong-material.js.map +1 -1
  82. package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts +2 -2
  83. package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts.map +1 -1
  84. package/dist/modules/lighting/phong-material/phong-shaders-glsl.js +2 -2
  85. package/dist/modules/math/fp64/fp64-arithmetic-glsl.d.ts +1 -1
  86. package/dist/modules/math/fp64/fp64-arithmetic-glsl.d.ts.map +1 -1
  87. package/dist/modules/math/fp64/fp64-arithmetic-glsl.js +1 -1
  88. package/package.json +3 -3
  89. package/src/index.ts +17 -1
  90. package/src/lib/color/normalize-byte-colors.ts +57 -0
  91. package/src/lib/glsl-utils/shader-utils.ts +4 -4
  92. package/src/lib/shader-assembly/assemble-shaders.ts +197 -69
  93. package/src/lib/shader-assembly/wgsl-binding-debug.ts +14 -3
  94. package/src/lib/shader-assembly/wgsl-binding-scan.ts +228 -0
  95. package/src/lib/shader-generator/glsl/generate-glsl.ts +4 -4
  96. package/src/lib/shader-module/shader-module-uniform-layout.ts +233 -8
  97. package/src/modules/color/float-colors.ts +99 -0
  98. package/src/modules/engine/picking/picking.ts +17 -19
  99. package/src/modules/engine/project/project.ts +1 -1
  100. package/src/modules/engine/skin/skin.ts +1 -1
  101. package/src/modules/lighting/gouraud-material/gouraud-material.ts +10 -3
  102. package/src/modules/lighting/lambert-material/lambert-shaders-glsl.ts +2 -2
  103. package/src/modules/lighting/lights/lighting-glsl.ts +1 -1
  104. package/src/modules/lighting/lights/lighting.ts +20 -11
  105. package/src/modules/lighting/no-material/dirlight.ts +2 -2
  106. package/src/modules/lighting/pbr-material/pbr-material-glsl.ts +138 -35
  107. package/src/modules/lighting/pbr-material/pbr-material-wgsl.ts +139 -35
  108. package/src/modules/lighting/pbr-material/pbr-material.ts +110 -3
  109. package/src/modules/lighting/pbr-material/pbr-projection.ts +1 -1
  110. package/src/modules/lighting/pbr-material/pbr-scene.ts +91 -0
  111. package/src/modules/lighting/phong-material/phong-material.ts +10 -3
  112. package/src/modules/lighting/phong-material/phong-shaders-glsl.ts +2 -2
  113. package/src/modules/math/fp64/fp64-arithmetic-glsl.ts +1 -1
package/dist/index.d.ts CHANGED
@@ -11,8 +11,8 @@ export { initializeShaderModule, initializeShaderModules } from "./lib/shader-mo
11
11
  export { getShaderModuleUniforms } from "./lib/shader-module/shader-module.js";
12
12
  export { getShaderModuleDependencies } from "./lib/shader-module/shader-module-dependencies.js";
13
13
  export { checkShaderModuleDeprecations } from "./lib/shader-module/shader-module.js";
14
- export type { ShaderModuleUniformLayoutStage, ShaderModuleUniformLayoutValidationResult } from "./lib/shader-module/shader-module-uniform-layout.js";
15
- export { getShaderModuleUniformBlockFields, getShaderModuleUniformBlockName, getShaderModuleUniformLayoutValidationResult, validateShaderModuleUniformLayout } from "./lib/shader-module/shader-module-uniform-layout.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";
16
16
  export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
17
17
  export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
18
18
  export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
@@ -29,9 +29,12 @@ export { assembleGLSLShaderPair } from "./lib/shader-assembly/assemble-shaders.j
29
29
  export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
30
30
  export { toHalfFloat, fromHalfFloat } from "./modules/math/fp16/fp16-utils.js";
31
31
  export { fp64ify, fp64LowPart, fp64ifyMatrix4 } from "./modules/math/fp64/fp64-utils.js";
32
+ export { normalizeByteColor3, normalizeByteColor4, resolveUseByteColors } from "./lib/color/normalize-byte-colors.js";
32
33
  export { random } from "./modules/math/random/random.js";
33
34
  export { fp32 } from "./modules/math/fp32/fp32.js";
34
35
  export { fp64, fp64arithmetic } from "./modules/math/fp64/fp64.js";
36
+ export type { FloatColorsProps, FloatColorsUniforms } from "./modules/color/float-colors.js";
37
+ export { floatColors } from "./modules/color/float-colors.js";
35
38
  export type { PickingProps, PickingUniforms } from "./modules/engine/picking/picking.js";
36
39
  export { picking } from "./modules/engine/picking/picking.js";
37
40
  export { skin } from "./modules/engine/skin/skin.js";
@@ -48,6 +51,8 @@ export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-mat
48
51
  export type { PhongMaterialProps } from "./modules/lighting/phong-material/phong-material.js";
49
52
  export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
50
53
  export type { PBRMaterialBindings, PBRMaterialProps, PBRMaterialUniforms } from "./modules/lighting/pbr-material/pbr-material.js";
54
+ export type { PBRSceneBindings, PBRSceneProps, PBRSceneUniforms } from "./modules/lighting/pbr-material/pbr-scene.js";
51
55
  export type { PBRProjectionProps } from "./modules/lighting/pbr-material/pbr-projection.js";
52
56
  export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
57
+ export { pbrScene } from "./modules/lighting/pbr-material/pbr-scene.js";
53
58
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,YAAY,EAAC,YAAY,EAAC,+CAA4C;AACtE,YAAY,EAAC,qBAAqB,EAAC,oDAAiD;AAIpF,YAAY,EAAC,YAAY,EAAC,6CAA0C;AACpE,YAAY,EAAC,UAAU,EAAC,2CAAwC;AAChE,YAAY,EAAC,wBAAwB,EAAE,YAAY,EAAC,qCAAkC;AAEtF,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;AAChF,YAAY,EACV,8BAA8B,EAC9B,yCAAyC,EAC1C,4DAAyD;AAC1D,OAAO,EACL,iCAAiC,EACjC,+BAA+B,EAC/B,4CAA4C,EAC5C,iCAAiC,EAClC,4DAAyD;AAE1D,OAAO,EAAC,qBAAqB,EAAC,kDAA+C;AAE7E,OAAO,EAAC,cAAc,IAAI,eAAe,EAAC,0DAAuD;AACjG,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,0DAAuD;AAGzG,OAAO,EAAC,eAAe,EAAC,kCAA+B;AACvD,YAAY,EAAC,UAAU,EAAC,8CAA2C;AACnE,YAAY,EAAC,eAAe,EAAC,mDAAgD;AAK7E,OAAO,EAAC,aAAa,EAAC,4CAAyC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACd,yCAAsC;AAGvC,YAAY,EAAC,uBAAuB,EAAC,kDAA+C;AACpF,OAAO,EAAC,uBAAuB,EAAC,kDAA+C;AAC/E,OAAO,EAAC,UAAU,EAAC,mDAAgD;AAGnE,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAC3D,OAAO,EAAC,sBAAsB,EAAC,kDAA+C;AAC9E,OAAO,EAAC,cAAc,EAAC,mDAAgD;AAGvE,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAC,0CAAuC;AAGpF,OAAO,EAAC,MAAM,EAAC,wCAAqC;AAEpD,OAAO,EAAC,IAAI,EAAC,oCAAiC;AAC9C,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,oCAAiC;AAO9D,YAAY,EAAC,YAAY,EAAE,eAAe,EAAC,4CAAyC;AACpF,OAAO,EAAC,OAAO,EAAC,4CAAyC;AACzD,OAAO,EAAC,IAAI,EAAC,sCAAmC;AAGhD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,8CAA2C;AAE5C,YAAY,EAAC,aAAa,EAAE,gBAAgB,EAAC,8CAA2C;AACxF,OAAO,EAAC,QAAQ,EAAC,8CAA2C;AAC5D,YAAY,EAAC,WAAW,EAAC,sCAAmC;AAC5D,OAAO,EAAC,GAAG,EAAC,sCAAmC;AAC/C,OAAO,EAAC,QAAQ,EAAC,mDAAgD;AACjE,YAAY,EAAC,oBAAoB,EAAC,gEAA6D;AAC/F,OAAO,EAAC,eAAe,EAAC,gEAA6D;AACrF,YAAY,EAAC,oBAAoB,EAAC,gEAA6D;AAC/F,OAAO,EAAC,eAAe,EAAC,gEAA6D;AACrF,YAAY,EAAC,kBAAkB,EAAC,4DAAyD;AACzF,OAAO,EAAC,aAAa,EAAC,4DAAyD;AAC/E,YAAY,EACV,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACpB,wDAAqD;AACtD,YAAY,EAAC,kBAAkB,EAAC,0DAAuD;AAEvF,OAAO,EAAC,WAAW,EAAC,wDAAqD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -5,7 +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 { getShaderModuleUniformBlockFields, getShaderModuleUniformBlockName, getShaderModuleUniformLayoutValidationResult, validateShaderModuleUniformLayout } from "./lib/shader-module/shader-module-uniform-layout.js";
8
+ export { getGLSLUniformBlocks, getShaderModuleUniformBlockFields, getShaderModuleUniformBlockName, getShaderModuleUniformLayoutValidationResult, validateShaderModuleUniformLayout, warnIfGLSLUniformBlocksAreNotStd140 } from "./lib/shader-module/shader-module-uniform-layout.js";
9
9
  export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
10
10
  export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
11
11
  export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
@@ -24,10 +24,12 @@ export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
24
24
  // data utils
25
25
  export { toHalfFloat, fromHalfFloat } from "./modules/math/fp16/fp16-utils.js";
26
26
  export { fp64ify, fp64LowPart, fp64ifyMatrix4 } from "./modules/math/fp64/fp64-utils.js";
27
+ export { normalizeByteColor3, normalizeByteColor4, resolveUseByteColors } from "./lib/color/normalize-byte-colors.js";
27
28
  // math libraries
28
29
  export { random } from "./modules/math/random/random.js";
29
30
  export { fp32 } from "./modules/math/fp32/fp32.js";
30
31
  export { fp64, fp64arithmetic } from "./modules/math/fp64/fp64.js";
32
+ export { floatColors } from "./modules/color/float-colors.js";
31
33
  export { picking } from "./modules/engine/picking/picking.js";
32
34
  export { skin } from "./modules/engine/skin/skin.js";
33
35
  export { lighting } from "./modules/lighting/lights/lighting.js";
@@ -37,4 +39,5 @@ export { lambertMaterial } from "./modules/lighting/lambert-material/lambert-mat
37
39
  export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
38
40
  export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
39
41
  export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
42
+ export { pbrScene } from "./modules/lighting/pbr-material/pbr-scene.js";
40
43
  //# 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;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;AAKhF,OAAO,EACL,iCAAiC,EACjC,+BAA+B,EAC/B,4CAA4C,EAC5C,iCAAiC,EAClC,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;AAQ/E,OAAO,EAAC,WAAW,EAAC,wDAAqD"}
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;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACrB,6CAA0C;AAE3C,iBAAiB;AACjB,OAAO,EAAC,MAAM,EAAC,wCAAqC;AAEpD,OAAO,EAAC,IAAI,EAAC,oCAAiC;AAC9C,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,oCAAiC;AAE9D,OAAO,EAAC,WAAW,EAAC,wCAAqC;AAQzD,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"}
@@ -0,0 +1,23 @@
1
+ import type { NumberArray3, NumberArray4 } from '@math.gl/types';
2
+ /**
3
+ * Resolves whether semantic colors should be interpreted as byte-style `0..255` values.
4
+ * @param useByteColors - Explicit color interpretation flag.
5
+ * @param defaultUseByteColors - Fallback value when `useByteColors` is omitted.
6
+ * @returns `true` when semantic colors should be normalized from bytes, otherwise `false`.
7
+ */
8
+ export declare function resolveUseByteColors(useByteColors?: boolean, defaultUseByteColors?: boolean): boolean;
9
+ /**
10
+ * Normalizes an RGB semantic color to float space when byte-style colors are enabled.
11
+ * @param color - Input RGB semantic color.
12
+ * @param useByteColors - When `true`, divide components by `255`.
13
+ * @returns The normalized RGB color.
14
+ */
15
+ export declare function normalizeByteColor3(color?: Readonly<NumberArray3>, useByteColors?: boolean): NumberArray3;
16
+ /**
17
+ * Normalizes an RGBA semantic color to float space when byte-style colors are enabled.
18
+ * @param color - Input RGB or RGBA semantic color.
19
+ * @param useByteColors - When `true`, divide components by `255`.
20
+ * @returns The normalized RGBA color, adding an opaque alpha channel when needed.
21
+ */
22
+ export declare function normalizeByteColor4(color: Readonly<NumberArray4> | Readonly<NumberArray3>, useByteColors?: boolean): NumberArray4;
23
+ //# sourceMappingURL=normalize-byte-colors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"normalize-byte-colors.d.ts","sourceRoot":"","sources":["../../../src/lib/color/normalize-byte-colors.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,CAAC,EAAE,OAAO,EACvB,oBAAoB,GAAE,OAAc,GACnC,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,GAAE,QAAQ,CAAC,YAAY,CAAa,EACzC,aAAa,GAAE,OAAc,GAC5B,YAAY,CAMd;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,EACtD,aAAa,GAAE,OAAc,GAC5B,YAAY,CAWd"}
@@ -0,0 +1,42 @@
1
+ // luma.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
4
+ /**
5
+ * Resolves whether semantic colors should be interpreted as byte-style `0..255` values.
6
+ * @param useByteColors - Explicit color interpretation flag.
7
+ * @param defaultUseByteColors - Fallback value when `useByteColors` is omitted.
8
+ * @returns `true` when semantic colors should be normalized from bytes, otherwise `false`.
9
+ */
10
+ export function resolveUseByteColors(useByteColors, defaultUseByteColors = true) {
11
+ return useByteColors ?? defaultUseByteColors;
12
+ }
13
+ /**
14
+ * Normalizes an RGB semantic color to float space when byte-style colors are enabled.
15
+ * @param color - Input RGB semantic color.
16
+ * @param useByteColors - When `true`, divide components by `255`.
17
+ * @returns The normalized RGB color.
18
+ */
19
+ export function normalizeByteColor3(color = [0, 0, 0], useByteColors = true) {
20
+ if (!useByteColors) {
21
+ return [...color];
22
+ }
23
+ return color.map(component => component / 255);
24
+ }
25
+ /**
26
+ * Normalizes an RGBA semantic color to float space when byte-style colors are enabled.
27
+ * @param color - Input RGB or RGBA semantic color.
28
+ * @param useByteColors - When `true`, divide components by `255`.
29
+ * @returns The normalized RGBA color, adding an opaque alpha channel when needed.
30
+ */
31
+ export function normalizeByteColor4(color, useByteColors = true) {
32
+ const normalizedColor = normalizeByteColor3(color.slice(0, 3), useByteColors);
33
+ const hasAlpha = Number.isFinite(color[3]);
34
+ const alpha = hasAlpha ? color[3] : 1;
35
+ return [
36
+ normalizedColor[0],
37
+ normalizedColor[1],
38
+ normalizedColor[2],
39
+ useByteColors && hasAlpha ? alpha / 255 : alpha
40
+ ];
41
+ }
42
+ //# sourceMappingURL=normalize-byte-colors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"normalize-byte-colors.js","sourceRoot":"","sources":["../../../src/lib/color/normalize-byte-colors.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,aAAuB,EACvB,uBAAgC,IAAI;IAEpC,OAAO,aAAa,IAAI,oBAAoB,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAgC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACzC,gBAAyB,IAAI;IAE7B,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,KAAK,CAAiB,CAAC;IACpC,CAAC;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,GAAG,GAAG,CAAiB,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAAsD,EACtD,gBAAyB,IAAI;IAE7B,MAAM,eAAe,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiB,EAAE,aAAa,CAAC,CAAC;IAC9F,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC,CAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAElD,OAAO;QACL,eAAe,CAAC,CAAC,CAAC;QAClB,eAAe,CAAC,CAAC,CAAC;QAClB,eAAe,CAAC,CAAC,CAAC;QAClB,aAAa,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK;KAChC,CAAC;AACpB,CAAC"}
@@ -44,7 +44,7 @@ void main() {
44
44
  }
45
45
  /** convert glsl type to suffix */
46
46
  export function typeToChannelSuffix(type) {
47
- // prettier-ignore
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
- // prettier-ignore
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
- // prettier-ignore
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
- // prettier-ignore
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":"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"}
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":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAM7C,OAAO,KAAK,EAAC,eAAe,EAAC,+BAA4B;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,0CAAuC;AACjE,OAAO,EAAC,UAAU,EAAuC,0BAAuB;AAGhF,OAAO,EAAoC,KAAK,qBAAqB,EAAC,gCAA6B;AAqBnG;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG;IACxD,YAAY,EAAE,YAAY,CAAC;IAC3B,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,iCAAiC;IACjC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,mCAAmC;IACnC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,wFAAwF;IACxF,YAAY,EAAE,YAAY,CAAC;IAC3B,gCAAgC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6BAA6B;IAC7B,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,6BAA6B;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,oGAAoG;IACpG,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,qBAAqB;IACrB,aAAa,CAAC,EAAE,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC;IACxC,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC;IAClD,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,oBAAoB;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,gCAAgC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,oBAAoB;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,6BAA6B;IAC7B,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,6BAA6B;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,oGAAoG;IACpG,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,qBAAqB;IACrB,aAAa,CAAC,EAAE,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC;IACxC,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC;IAClD,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,oBAAoB;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9F;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEjF;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,qBAAqB,GAAG;IAC/B,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,GACA;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,eAAe,CAAC;IAC7B,kBAAkB,EAAE;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAC1F,YAAY,EAAE,qBAAqB,EAAE,CAAC;CACvC,CAeA;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,qBAAqB,GAAG;IAC/B,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,sBAAsB;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA;IACD,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,eAAe,CAAC;CAC9B,CAoBA;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,oBAAoB,GAC5B;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,qBAAqB,EAAE,CAAA;CAAC,CAiI/D;AA4JD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,IAC7B,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAU5E;AAkCD,gGAAgG;AAChG,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,EACrC,GAAG,CAAC,EAAE,GAAG,GACR,MAAM,CAgCR;AAQD,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}
1
+ {"version":3,"file":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}
@@ -6,20 +6,13 @@ import { getPlatformShaderDefines } from "./platform-defines.js";
6
6
  import { injectShader, DECLARATION_INJECT_MARKER } from "./shader-injections.js";
7
7
  import { transpileGLSLShader } from "../shader-transpiler/transpile-glsl-shader.js";
8
8
  import { checkShaderModuleDeprecations } from "../shader-module/shader-module.js";
9
- import { validateShaderModuleUniformLayout } from "../shader-module/shader-module-uniform-layout.js";
9
+ import { validateShaderModuleUniformLayout, warnIfGLSLUniformBlocksAreNotStd140 } from "../shader-module/shader-module-uniform-layout.js";
10
10
  import { normalizeShaderHooks, getShaderHooks } from "./shader-hooks.js";
11
11
  import { assert } from "../utils/assert.js";
12
12
  import { getShaderInfo } from "../glsl-utils/get-shader-info.js";
13
13
  import { getShaderBindingDebugRowsFromWGSL } from "./wgsl-binding-debug.js";
14
+ import { MODULE_WGSL_BINDING_DECLARATION_REGEXES, WGSL_BINDING_DECLARATION_REGEXES, WGSL_EXPLICIT_BINDING_DECLARATION_REGEXES, getFirstWGSLAutoBindingDeclarationMatch, getWGSLBindingDeclarationMatches, hasWGSLAutoBinding, replaceWGSLBindingDeclarationMatches } from "./wgsl-binding-scan.js";
14
15
  const INJECT_SHADER_DECLARATIONS = `\n\n${DECLARATION_INJECT_MARKER}\n`;
15
- const MODULE_WGSL_BINDING_DECLARATION_REGEXES = [
16
- /@binding\(\s*(auto|\d+)\s*\)\s*@group\(\s*(\d+)\s*\)\s*(var(?:<[^>]+>)?\s+([A-Za-z_][A-Za-z0-9_]*))/g,
17
- /@group\(\s*(\d+)\s*\)\s*@binding\(\s*(auto|\d+)\s*\)\s*(var(?:<[^>]+>)?\s+([A-Za-z_][A-Za-z0-9_]*))/g
18
- ];
19
- const WGSL_BINDING_DECLARATION_REGEXES = [
20
- /@binding\(\s*(\d+)\s*\)\s*@group\(\s*(\d+)\s*\)\s*(var(?:<[^>]+>)?\s+([A-Za-z_][A-Za-z0-9_]*))/g,
21
- /@group\(\s*(\d+)\s*\)\s*@binding\(\s*(\d+)\s*\)\s*(var(?:<[^>]+>)?\s+([A-Za-z_][A-Za-z0-9_]*))/g
22
- ];
23
16
  const RESERVED_APPLICATION_GROUP_0_BINDING_LIMIT = 100;
24
17
  /**
25
18
  * Precision prologue to inject before functions are injected in shader
@@ -135,7 +128,8 @@ export function assembleShaderWGSL(platformInfo, options) {
135
128
  }
136
129
  // TODO - hack until shadertool modules support WebGPU
137
130
  const modulesToInject = modules;
138
- const usedBindingsByGroup = getUsedBindingsByGroupFromApplicationWGSL(coreSource);
131
+ const applicationRelocation = relocateWGSLApplicationBindings(coreSource);
132
+ const usedBindingsByGroup = getUsedBindingsByGroupFromApplicationWGSL(applicationRelocation.source);
139
133
  const reservedBindingKeysByGroup = reserveRegisteredModuleBindings(modulesToInject, options._bindingRegistry, usedBindingsByGroup);
140
134
  const bindingAssignments = [];
141
135
  for (const module of modulesToInject) {
@@ -172,7 +166,7 @@ export function assembleShaderWGSL(platformInfo, options) {
172
166
  assembledSource += getShaderHooks(hookFunctionMap[stage], hookInjections);
173
167
  assembledSource += formatWGSLBindingAssignmentComments(bindingAssignments);
174
168
  // Add the version directive and actual source of this shader
175
- assembledSource += coreSource;
169
+ assembledSource += applicationRelocation.source;
176
170
  // Apply any requested shader injections
177
171
  assembledSource = injectShader(assembledSource, stage, mainInjections);
178
172
  assertNoUnresolvedAutoBindings(assembledSource);
@@ -289,6 +283,9 @@ ${getApplicationDefines(allDefines)}
289
283
  if (language === 'glsl' && sourceVersion !== targetVersion) {
290
284
  assembledSource = transpileGLSLShader(assembledSource, stage);
291
285
  }
286
+ if (language === 'glsl') {
287
+ warnIfGLSLUniformBlocksAreNotStd140(assembledSource, stage, log);
288
+ }
292
289
  return assembledSource.trim();
293
290
  }
294
291
  /**
@@ -374,44 +371,58 @@ export function getShaderModuleSource(module, stage, log) {
374
371
  }
375
372
  function getUsedBindingsByGroupFromApplicationWGSL(source) {
376
373
  const usedBindingsByGroup = new Map();
377
- for (const regex of WGSL_BINDING_DECLARATION_REGEXES) {
378
- regex.lastIndex = 0;
379
- let match;
380
- while ((match = regex.exec(source))) {
381
- const isBindingFirst = regex === WGSL_BINDING_DECLARATION_REGEXES[0];
382
- const location = Number(match[isBindingFirst ? 1 : 2]);
383
- const group = Number(match[isBindingFirst ? 2 : 1]);
384
- const name = match[4];
385
- validateApplicationWGSLBinding(group, location, name);
386
- registerUsedBindingLocation(usedBindingsByGroup, group, location, `application binding "${name}"`);
387
- }
374
+ for (const match of getWGSLBindingDeclarationMatches(source, WGSL_EXPLICIT_BINDING_DECLARATION_REGEXES)) {
375
+ const location = Number(match.bindingToken);
376
+ const group = Number(match.groupToken);
377
+ validateApplicationWGSLBinding(group, location, match.name);
378
+ registerUsedBindingLocation(usedBindingsByGroup, group, location, `application binding "${match.name}"`);
388
379
  }
389
380
  return usedBindingsByGroup;
390
381
  }
382
+ function relocateWGSLApplicationBindings(source) {
383
+ const declarationMatches = getWGSLBindingDeclarationMatches(source, WGSL_BINDING_DECLARATION_REGEXES);
384
+ const usedBindingsByGroup = new Map();
385
+ for (const declarationMatch of declarationMatches) {
386
+ if (declarationMatch.bindingToken === 'auto') {
387
+ continue;
388
+ }
389
+ const location = Number(declarationMatch.bindingToken);
390
+ const group = Number(declarationMatch.groupToken);
391
+ validateApplicationWGSLBinding(group, location, declarationMatch.name);
392
+ registerUsedBindingLocation(usedBindingsByGroup, group, location, `application binding "${declarationMatch.name}"`);
393
+ }
394
+ const relocationState = {
395
+ sawSupportedBindingDeclaration: declarationMatches.length > 0
396
+ };
397
+ const relocatedSource = replaceWGSLBindingDeclarationMatches(source, WGSL_BINDING_DECLARATION_REGEXES, declarationMatch => relocateWGSLApplicationBindingMatch(declarationMatch, usedBindingsByGroup, relocationState));
398
+ if (hasWGSLAutoBinding(source) && !relocationState.sawSupportedBindingDeclaration) {
399
+ throw new Error('Unsupported @binding(auto) declaration form in application WGSL. ' +
400
+ 'Use adjacent "@group(N)" and "@binding(auto)" decorators followed by a bindable "var" declaration.');
401
+ }
402
+ return { source: relocatedSource };
403
+ }
391
404
  function relocateWGSLModuleBindings(moduleSource, module, context) {
392
405
  const bindingAssignments = [];
406
+ const declarationMatches = getWGSLBindingDeclarationMatches(moduleSource, MODULE_WGSL_BINDING_DECLARATION_REGEXES);
393
407
  const relocationState = {
394
- sawSupportedBindingDeclaration: false,
408
+ sawSupportedBindingDeclaration: declarationMatches.length > 0,
395
409
  nextHintedBindingLocation: typeof module.firstBindingSlot === 'number' ? module.firstBindingSlot : null
396
410
  };
397
- let relocatedSource = relocateWGSLModuleBindingsWithRegex(moduleSource, MODULE_WGSL_BINDING_DECLARATION_REGEXES[0], { isBindingFirst: true, module, context, bindingAssignments, relocationState });
398
- relocatedSource = relocateWGSLModuleBindingsWithRegex(relocatedSource, MODULE_WGSL_BINDING_DECLARATION_REGEXES[1], { isBindingFirst: false, module, context, bindingAssignments, relocationState });
399
- if (moduleSource.includes('@binding(auto)') && !relocationState.sawSupportedBindingDeclaration) {
411
+ const relocatedSource = replaceWGSLBindingDeclarationMatches(moduleSource, MODULE_WGSL_BINDING_DECLARATION_REGEXES, declarationMatch => relocateWGSLModuleBindingMatch(declarationMatch, {
412
+ module,
413
+ context,
414
+ bindingAssignments,
415
+ relocationState
416
+ }));
417
+ if (hasWGSLAutoBinding(moduleSource) && !relocationState.sawSupportedBindingDeclaration) {
400
418
  throw new Error(`Unsupported @binding(auto) declaration form in module "${module.name}". ` +
401
- 'Use "@group(N) @binding(auto) var ..." or "@binding(auto) @group(N) var ..." on a single line.');
419
+ 'Use adjacent "@group(N)" and "@binding(auto)" decorators followed by a bindable "var" declaration.');
402
420
  }
403
421
  return { source: relocatedSource, bindingAssignments };
404
422
  }
405
- function relocateWGSLModuleBindingsWithRegex(source, regex, params) {
406
- return source.replace(regex, (...replaceArguments) => relocateWGSLModuleBindingMatch(replaceArguments, params));
407
- }
408
- function relocateWGSLModuleBindingMatch(replaceArguments, params) {
409
- const { isBindingFirst, module, context, bindingAssignments, relocationState } = params;
410
- relocationState.sawSupportedBindingDeclaration = true;
411
- const match = replaceArguments[0];
412
- const bindingToken = replaceArguments[isBindingFirst ? 1 : 2];
413
- const groupToken = replaceArguments[isBindingFirst ? 2 : 1];
414
- const name = replaceArguments[4];
423
+ function relocateWGSLModuleBindingMatch(declarationMatch, params) {
424
+ const { module, context, bindingAssignments, relocationState } = params;
425
+ const { match, bindingToken, groupToken, name } = declarationMatch;
415
426
  const group = Number(groupToken);
416
427
  if (bindingToken === 'auto') {
417
428
  const registryKey = getBindingRegistryKey(group, module.name, name);
@@ -441,6 +452,18 @@ function relocateWGSLModuleBindingMatch(replaceArguments, params) {
441
452
  bindingAssignments.push({ moduleName: module.name, name, group, location });
442
453
  return match;
443
454
  }
455
+ function relocateWGSLApplicationBindingMatch(declarationMatch, usedBindingsByGroup, relocationState) {
456
+ const { match, bindingToken, groupToken, name } = declarationMatch;
457
+ const group = Number(groupToken);
458
+ if (bindingToken === 'auto') {
459
+ const location = allocateApplicationAutoBindingLocation(group, usedBindingsByGroup);
460
+ validateApplicationWGSLBinding(group, location, name);
461
+ registerUsedBindingLocation(usedBindingsByGroup, group, location, `application binding "${name}"`);
462
+ return match.replace(/@binding\(\s*auto\s*\)/, `@binding(${location})`);
463
+ }
464
+ relocationState.sawSupportedBindingDeclaration = true;
465
+ return match;
466
+ }
444
467
  function reserveRegisteredModuleBindings(modules, bindingRegistry, usedBindingsByGroup) {
445
468
  const reservedBindingKeysByGroup = new Map();
446
469
  if (!bindingRegistry) {
@@ -481,16 +504,11 @@ function claimReservedBindingLocation(reservedBindingKeysByGroup, group, locatio
481
504
  function getModuleWGSLBindingDeclarations(module) {
482
505
  const declarations = [];
483
506
  const moduleSource = module.source || '';
484
- for (const regex of MODULE_WGSL_BINDING_DECLARATION_REGEXES) {
485
- regex.lastIndex = 0;
486
- let match;
487
- while ((match = regex.exec(moduleSource))) {
488
- const isBindingFirst = regex === MODULE_WGSL_BINDING_DECLARATION_REGEXES[0];
489
- declarations.push({
490
- name: match[4],
491
- group: Number(match[isBindingFirst ? 2 : 1])
492
- });
493
- }
507
+ for (const match of getWGSLBindingDeclarationMatches(moduleSource, MODULE_WGSL_BINDING_DECLARATION_REGEXES)) {
508
+ declarations.push({
509
+ name: match.name,
510
+ group: Number(match.groupToken)
511
+ });
494
512
  }
495
513
  return declarations;
496
514
  }
@@ -527,10 +545,27 @@ function allocateAutoBindingLocation(group, usedBindingsByGroup, preferredBindin
527
545
  }
528
546
  return nextBinding;
529
547
  }
548
+ function allocateApplicationAutoBindingLocation(group, usedBindingsByGroup) {
549
+ const usedBindings = usedBindingsByGroup.get(group) || new Set();
550
+ let nextBinding = 0;
551
+ while (usedBindings.has(nextBinding)) {
552
+ nextBinding++;
553
+ }
554
+ return nextBinding;
555
+ }
530
556
  function assertNoUnresolvedAutoBindings(source) {
531
- if (/@binding\(\s*auto\s*\)/.test(source)) {
532
- throw new Error('Unresolved @binding(auto) remained in assembled WGSL source.');
557
+ const unresolvedBinding = getFirstWGSLAutoBindingDeclarationMatch(source, MODULE_WGSL_BINDING_DECLARATION_REGEXES);
558
+ if (!unresolvedBinding) {
559
+ return;
560
+ }
561
+ const moduleName = getWGSLModuleNameAtIndex(source, unresolvedBinding.index);
562
+ if (moduleName) {
563
+ throw new Error(`Unresolved @binding(auto) for module "${moduleName}" binding "${unresolvedBinding.name}" remained in assembled WGSL source.`);
564
+ }
565
+ if (isInApplicationWGSLSection(source, unresolvedBinding.index)) {
566
+ throw new Error(`Unresolved @binding(auto) for application binding "${unresolvedBinding.name}" remained in assembled WGSL source.`);
533
567
  }
568
+ throw new Error(`Unresolved @binding(auto) remained in assembled WGSL source near "${formatWGSLSourceSnippet(unresolvedBinding.match)}".`);
534
569
  }
535
570
  function formatWGSLBindingAssignmentComments(bindingAssignments) {
536
571
  if (bindingAssignments.length === 0) {
@@ -546,6 +581,24 @@ function formatWGSLBindingAssignmentComments(bindingAssignments) {
546
581
  function getBindingRegistryKey(group, moduleName, bindingName) {
547
582
  return `${group}:${moduleName}:${bindingName}`;
548
583
  }
584
+ function getWGSLModuleNameAtIndex(source, index) {
585
+ const moduleHeaderRegex = /^\/\/ ----- MODULE ([^\n]+) ---------------$/gm;
586
+ let moduleName;
587
+ let match;
588
+ match = moduleHeaderRegex.exec(source);
589
+ while (match && match.index <= index) {
590
+ moduleName = match[1];
591
+ match = moduleHeaderRegex.exec(source);
592
+ }
593
+ return moduleName;
594
+ }
595
+ function isInApplicationWGSLSection(source, index) {
596
+ const injectionMarkerIndex = source.indexOf(INJECT_SHADER_DECLARATIONS);
597
+ return injectionMarkerIndex >= 0 ? index > injectionMarkerIndex : true;
598
+ }
599
+ function formatWGSLSourceSnippet(source) {
600
+ return source.replace(/\s+/g, ' ').trim();
601
+ }
549
602
  /*
550
603
  function getHookFunctions(
551
604
  hookFunctions: Record<string, HookFunction>,
@@ -1 +1 @@
1
- {"version":3,"file":"assemble-shaders.js","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assemble-shaders.js","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"wgsl-binding-debug.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/wgsl-binding-debug.ts"],"names":[],"mappings":"AAIA,KAAK,uBAAuB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAOF,8EAA8E;AAC9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,IAAI,EACA,SAAS,GACT,SAAS,GACT,mBAAmB,GACnB,SAAS,GACT,SAAS,GACT,iBAAiB,GACjB,SAAS,CAAC;IACd,yEAAyE;IACzE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAAC;IAChC,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,kFAAkF;AAClF,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,kBAAkB,GAAE,uBAAuB,EAAO,GACjD,qBAAqB,EAAE,CAiDzB"}
1
+ {"version":3,"file":"wgsl-binding-debug.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/wgsl-binding-debug.ts"],"names":[],"mappings":"AAMA,KAAK,uBAAuB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAaF,8EAA8E;AAC9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,IAAI,EACA,SAAS,GACT,SAAS,GACT,mBAAmB,GACnB,SAAS,GACT,SAAS,GACT,iBAAiB,GACjB,SAAS,CAAC;IACd,yEAAyE;IACzE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAAC;IAChC,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,kFAAkF;AAClF,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,kBAAkB,GAAE,uBAAuB,EAAO,GACjD,qBAAqB,EAAE,CAoDzB"}
@@ -1,12 +1,14 @@
1
1
  // luma.gl
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
+ import { WGSL_BINDABLE_VARIABLE_PATTERN, maskWGSLComments } from "./wgsl-binding-scan.js";
4
5
  const WGSL_BINDING_DEBUG_REGEXES = [
5
- /@binding\(\s*(\d+)\s*\)\s*@group\(\s*(\d+)\s*\)\s*var(?:<([^>]+)>)?\s+([A-Za-z_][A-Za-z0-9_]*)\s*:\s*([^;]+);/g,
6
- /@group\(\s*(\d+)\s*\)\s*@binding\(\s*(\d+)\s*\)\s*var(?:<([^>]+)>)?\s+([A-Za-z_][A-Za-z0-9_]*)\s*:\s*([^;]+);/g
6
+ new RegExp(`@binding\\(\\s*(\\d+)\\s*\\)\\s*@group\\(\\s*(\\d+)\\s*\\)\\s*${WGSL_BINDABLE_VARIABLE_PATTERN}\\s*:\\s*([^;]+);`, 'g'),
7
+ new RegExp(`@group\\(\\s*(\\d+)\\s*\\)\\s*@binding\\(\\s*(\\d+)\\s*\\)\\s*${WGSL_BINDABLE_VARIABLE_PATTERN}\\s*:\\s*([^;]+);`, 'g')
7
8
  ];
8
9
  /** Builds a stable, table-friendly binding summary from assembled WGSL source. */
9
10
  export function getShaderBindingDebugRowsFromWGSL(source, bindingAssignments = []) {
11
+ const maskedSource = maskWGSLComments(source);
10
12
  const assignmentMap = new Map();
11
13
  for (const bindingAssignment of bindingAssignments) {
12
14
  assignmentMap.set(getBindingAssignmentKey(bindingAssignment.name, bindingAssignment.group, bindingAssignment.location), bindingAssignment.moduleName);
@@ -15,7 +17,8 @@ export function getShaderBindingDebugRowsFromWGSL(source, bindingAssignments = [
15
17
  for (const regex of WGSL_BINDING_DEBUG_REGEXES) {
16
18
  regex.lastIndex = 0;
17
19
  let match;
18
- while ((match = regex.exec(source))) {
20
+ match = regex.exec(maskedSource);
21
+ while (match) {
19
22
  const isBindingFirst = regex === WGSL_BINDING_DEBUG_REGEXES[0];
20
23
  const binding = Number(match[isBindingFirst ? 1 : 2]);
21
24
  const group = Number(match[isBindingFirst ? 2 : 1]);
@@ -32,6 +35,7 @@ export function getShaderBindingDebugRowsFromWGSL(source, bindingAssignments = [
32
35
  accessDeclaration,
33
36
  resourceType
34
37
  }));
38
+ match = regex.exec(maskedSource);
35
39
  }
36
40
  }
37
41
  return rows.sort((left, right) => {