@luma.gl/shadertools 9.1.0-alpha.1 → 9.1.0-alpha.12

package/dist/index.d.ts

@@ -2,15 +2,19 @@
  * Marks GLSL shaders for syntax highlighting: glsl`...`
  * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
  */
-export { glsl } from "./lib/glsl-utils/highlight.js";
 export type { PlatformInfo } from "./lib/shader-assembly/platform-info.js";
 export type { ShaderModule } from "./lib/shader-module/shader-module.js";
 export type { ShaderPass } from "./lib/shader-module/shader-pass.js";
+export { initializeShaderModule, initializeShaderModules } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleUniforms } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleDependencies } from "./lib/shader-module/shader-module-dependencies.js";
+export { checkShaderModuleDeprecations } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
+export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
+export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
+export { ShaderAssembler } from "./lib/shader-assembler.js";
 export type { ShaderHook } from "./lib/shader-assembly/shader-hooks.js";
 export type { ShaderInjection } from "./lib/shader-assembly/shader-injections.js";
-export { ShaderModuleInstance } from "./lib/shader-module/shader-module-instance.js";
-export { ShaderAssembler } from "./lib/shader-assembler.js";
-export { normalizeShaderModule } from "./lib/shader-module/normalize-shader-module.js";
 export { getShaderInfo } from "./lib/glsl-utils/get-shader-info.js";
 export { getQualifierDetails, getPassthroughFS, typeToChannelSuffix, typeToChannelCount, convertToVec4 } from "./lib/glsl-utils/shader-utils.js";
 export type { ShaderGenerationOptions } from "./lib/shader-generator/generate-shader.js";
@@ -18,18 +22,15 @@ export { generateShaderForModule } from "./lib/shader-generator/generate-shader.
 export { capitalize } from "./lib/shader-generator/utils/capitalize.js";
 export { preprocess } from "./lib/preprocessor/preprocessor.js";
 export { assembleGLSLShaderPair } from "./lib/shader-assembly/assemble-shaders.js";
-export { ShaderModuleInstance as _ShaderModuleInstance } from "./lib/shader-module/shader-module-instance.js";
 export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
-export { resolveModules as _resolveModules } from "./lib/shader-assembly/resolve-modules.js";
-export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-assembly/resolve-modules.js";
 export { getShaderLayoutFromWGSL } from "./lib/wgsl/get-shader-layout-wgsl.js";
 export { toHalfFloat, fromHalfFloat } from "./modules/math/fp16/fp16-utils.js";
 export { fp64ify, fp64LowPart, fp64ifyMatrix4 } from "./modules/math/fp64/fp64-utils.js";
 export { random } from "./modules/math/random/random.js";
 export { fp32 } from "./modules/math/fp32/fp32.js";
-export type { PickingProps } from "./modules/engine/picking/picking.js";
+export type { PickingProps, PickingUniforms } from "./modules/engine/picking/picking.js";
 export { picking } from "./modules/engine/picking/picking.js";
-export type { LightingProps } from "./modules/lighting/lights/lighting.js";
+export type { LightingProps, LightingUniforms } from "./modules/lighting/lights/lighting.js";
 export { lighting } from "./modules/lighting/lights/lighting.js";
 export { dirlight } from "./modules/lighting/no-material/dirlight.js";
 export type { PhongMaterialUniforms as GouraudMaterialUniforms } from "./modules/lighting/phong-material/phong-material.js";
@@ -37,44 +38,44 @@ export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-mat
 export type { PhongMaterialUniforms } from "./modules/lighting/phong-material/phong-material.js";
 export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
-export type { BrightnessContrastProps } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
+export type { BrightnessContrastProps, BrightnessContrastUniforms } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
 export { brightnessContrast } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
-export type { DenoiseProps } from "./modules/postprocessing/image-adjust-filters/denoise.js";
+export type { DenoiseProps, DenoiseUniforms } from "./modules/postprocessing/image-adjust-filters/denoise.js";
 export { denoise } from "./modules/postprocessing/image-adjust-filters/denoise.js";
-export type { HueSaturationProps } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
+export type { HueSaturationProps, HueSaturationUniforms } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
 export { hueSaturation } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
-export type { NoiseProps } from "./modules/postprocessing/image-adjust-filters/noise.js";
+export type { NoiseProps, NoiseUniforms } from "./modules/postprocessing/image-adjust-filters/noise.js";
 export { noise } from "./modules/postprocessing/image-adjust-filters/noise.js";
-export type { SepiaProps } from "./modules/postprocessing/image-adjust-filters/sepia.js";
+export type { SepiaProps, SepiaUniforms } from "./modules/postprocessing/image-adjust-filters/sepia.js";
 export { sepia } from "./modules/postprocessing/image-adjust-filters/sepia.js";
-export type { VibranceProps } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
+export type { VibranceProps, VibranceUniforms } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
 export { vibrance } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
-export type { VignetteProps } from "./modules/postprocessing/image-adjust-filters/vignette.js";
+export type { VignetteProps, VignetteUniforms } from "./modules/postprocessing/image-adjust-filters/vignette.js";
 export { vignette } from "./modules/postprocessing/image-adjust-filters/vignette.js";
-export type { TiltShiftProps } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
+export type { TiltShiftProps, TiltShiftUniforms } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
 export { tiltShift } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
-export type { TriangleBlurProps } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
+export type { TriangleBlurProps, TriangleBlurUniforms } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
 export { triangleBlur } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
-export type { ZoomBlurProps } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
+export type { ZoomBlurProps, ZoomBlurUniforms } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
 export { zoomBlur } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
-export type { ColorHalftoneProps } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
+export type { ColorHalftoneProps, ColorHalftoneUniforms } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
 export { colorHalftone } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
-export type { DotScreenProps } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
+export type { DotScreenProps, DotScreenUniforms } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
 export { dotScreen } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
-export type { EdgeWorkProps } from "./modules/postprocessing/image-fun-filters/edgework.js";
+export type { EdgeWorkProps, EdgeWorkUniforms } from "./modules/postprocessing/image-fun-filters/edgework.js";
 export { edgeWork } from "./modules/postprocessing/image-fun-filters/edgework.js";
-export type { HexagonalPixelateProps } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
+export type { HexagonalPixelateProps, HexagonalPixelateUniforms } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
 export { hexagonalPixelate } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
-export type { InkProps } from "./modules/postprocessing/image-fun-filters/ink.js";
+export type { InkProps, InkUniforms } from "./modules/postprocessing/image-fun-filters/ink.js";
 export { ink } from "./modules/postprocessing/image-fun-filters/ink.js";
-export type { MagnifyProps } from "./modules/postprocessing/image-fun-filters/magnify.js";
+export type { MagnifyProps, MagnifyUniforms } from "./modules/postprocessing/image-fun-filters/magnify.js";
 export { magnify } from "./modules/postprocessing/image-fun-filters/magnify.js";
-export type { BulgePinchProps } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
+export type { BulgePinchProps, BulgePinchUniforms } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
 export { bulgePinch } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
-export type { SwirlProps } from "./modules/postprocessing/image-warp-filters/swirl.js";
+export type { SwirlProps, SwirlUniforms } from "./modules/postprocessing/image-warp-filters/swirl.js";
 export { swirl } from "./modules/postprocessing/image-warp-filters/swirl.js";
 export { fxaa } from "./modules/postprocessing/fxaa/fxaa.js";
-export type { WarpProps } from "./modules/postprocessing/image-warp-filters/warp.js";
+export type { WarpProps, WarpUniforms } from "./modules/postprocessing/image-warp-filters/warp.js";
 export { warp as _warp } from "./modules/postprocessing/image-warp-filters/warp.js";
 export { fp64, fp64arithmetic } from "./modules-webgl1/math/fp64/fp64.js";
 export { geometry as geometry1 } from "./modules-webgl1/geometry/geometry.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,16 +1,15 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-// shadertools exports
-/**
- * Marks GLSL shaders for syntax highlighting: glsl`...`
- * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
- */
-export { glsl } from "./lib/glsl-utils/highlight.js";
-export { ShaderModuleInstance } from "./lib/shader-module/shader-module-instance.js";
+export { initializeShaderModule, initializeShaderModules } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleUniforms } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleDependencies } from "./lib/shader-module/shader-module-dependencies.js";
+export { checkShaderModuleDeprecations } from "./lib/shader-module/shader-module.js";
+export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
+export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
+export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-module/shader-module-dependencies.js";
 // ShaderAssembler
 export { ShaderAssembler } from "./lib/shader-assembler.js";
-export { normalizeShaderModule } from "./lib/shader-module/normalize-shader-module.js";
 // SHADER HELPERS
 // Shader source introspection
 export { getShaderInfo } from "./lib/glsl-utils/get-shader-info.js";
@@ -20,10 +19,7 @@ export { capitalize } from "./lib/shader-generator/utils/capitalize.js";
 // TEST EXPORTS - Do not use in production applications
 export { preprocess } from "./lib/preprocessor/preprocessor.js";
 export { assembleGLSLShaderPair } from "./lib/shader-assembly/assemble-shaders.js";
-export { ShaderModuleInstance as _ShaderModuleInstance } from "./lib/shader-module/shader-module-instance.js";
 export { combineInjects } from "./lib/shader-assembly/shader-injections.js";
-export { resolveModules as _resolveModules } from "./lib/shader-assembly/resolve-modules.js";
-export { getDependencyGraph as _getDependencyGraph } from "./lib/shader-assembly/resolve-modules.js";
 // EXPERIMENTAL WGSL
 export { getShaderLayoutFromWGSL } from "./lib/wgsl/get-shader-layout-wgsl.js";
 // data utils
@@ -58,7 +54,7 @@ export { magnify } from "./modules/postprocessing/image-fun-filters/magnify.js";
 export { bulgePinch } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
 export { swirl } from "./modules/postprocessing/image-warp-filters/swirl.js";
 // Postprocessing modules
-// export type {FXAAProps} from './modules/postprocessing/fxaa/fxaa';
+// export type {FXAAProps, FXAAUniforms} from './modules/postprocessing/fxaa/fxaa';
 export { fxaa } from "./modules/postprocessing/fxaa/fxaa.js";
 export { warp as _warp } from "./modules/postprocessing/image-warp-filters/warp.js";
 // DEPRECATED - v8 legacy shader modules (non-uniform buffer)

package/dist/lib/glsl-utils/shader-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"AAaA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAGF,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAC5B,aAAa,GAAG,IAAI,CAUtB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAkBT;AAED,kCAAkC;AAClC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAU7E;AAED,yCAAyC;AACzC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAU9D;AAaD,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAU/E"}
+{"version":3,"file":"shader-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"AAWA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAGF,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAC5B,aAAa,GAAG,IAAI,CAUtB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAkBT;AAED,kCAAkC;AAClC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAU7E;AAED,yCAAyC;AACzC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAU9D;AAaD,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAU/E"}

package/dist/lib/glsl-utils/shader-utils.js

@@ -1,11 +1,10 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { glsl } from "./highlight.js";
-const FS_GLES = `\
+const FS_GLES = /* glsl */ `\
 out vec4 transform_output;
 void main() {
-transform_output = vec4(0);
+  transform_output = vec4(0);
 }`;
 const FS300 = `#version 300 es\n${FS_GLES}`;
 // Prase given glsl line and return qualifier details or null

package/dist/lib/shader-assembler.d.ts

@@ -1,5 +1,4 @@
 import type { ShaderModule } from "./shader-module/shader-module.js";
-import { ShaderModuleInstance } from "./shader-module/shader-module-instance.js";
 import { AssembleShaderProps, GetUniformsFunc } from "./shader-assembly/assemble-shaders.js";
 /**
  * A stateful version of `assembleShaders` that can be used to assemble shaders.
@@ -40,7 +39,7 @@ export declare class ShaderAssembler {
     assembleWGSLShader(props: AssembleShaderProps): {
         source: string;
         getUniforms: GetUniformsFunc;
-        modules: ShaderModuleInstance[];
+        modules: ShaderModule[];
     };
     /**
      * Assemble a pair of shaders into a single shader program
@@ -52,11 +51,11 @@ export declare class ShaderAssembler {
         vs: string;
         fs: string;
         getUniforms: GetUniformsFunc;
-        modules: ShaderModuleInstance[];
+        modules: ShaderModule[];
     };
     /**
      * Dedupe and combine with default modules
      */
-    _getModuleList(appModules?: (ShaderModule | ShaderModuleInstance)[]): ShaderModuleInstance[];
+    _getModuleList(appModules?: ShaderModule[]): ShaderModule[];
 }
 //# sourceMappingURL=shader-assembler.d.ts.map

package/dist/lib/shader-assembler.d.ts.map

@@ -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;AAChE,OAAO,EAAC,oBAAoB,EAAC,kDAA+C;AAC5E,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGhB,8CAA2C;AAG5C;;;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;IAE7C;;;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,oBAAoB,EAAE,CAAC;KACjC;IAgBD;;;;;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,oBAAoB,EAAE,CAAC;KACjC;IAgBD;;OAEG;IACH,cAAc,CAAC,UAAU,GAAE,CAAC,YAAY,GAAG,oBAAoB,CAAC,EAAO,GAAG,oBAAoB,EAAE;CA2BjG"}
+{"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;AAG5C;;;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;IAE7C;;;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;KACzB;IAgBD;;;;;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"}

package/dist/lib/shader-assembler.js

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { ShaderModuleInstance } from "./shader-module/shader-module-instance.js";
+import { initializeShaderModules } from "./shader-module/shader-module.js";
 import { assembleWGSLShader, assembleGLSLShaderPair } from "./shader-assembly/assemble-shaders.js";
 import { preprocess } from "./preprocessor/preprocessor.js";
 /**
@@ -112,6 +112,7 @@ export class ShaderAssembler {
             }
         }
         modules.length = count;
-        return ShaderModuleInstance.instantiateModules(modules);
+        initializeShaderModules(modules);
+        return modules;
     }
 }

package/dist/lib/shader-assembly/assemble-shaders.d.ts

@@ -1,5 +1,4 @@
 import { PlatformInfo } from "./platform-info.js";
-import { ShaderModuleInstance } from "../shader-module/shader-module-instance.js";
 import type { ShaderInjection } from "./shader-injections.js";
 import type { ShaderModule } from "../shader-module/shader-module.js";
 import { ShaderHook } from "./shader-hooks.js";
@@ -23,7 +22,7 @@ export type AssembleShaderOptions = {
     /** Inject shader id #defines */
     id?: string;
     /** Modules to be injected */
-    modules?: (ShaderModule | ShaderModuleInstance)[];
+    modules?: ShaderModule[];
     /** Defines to be injected */
     defines?: Record<string, ShaderDefine>;
     /** Hook functions */
@@ -103,6 +102,8 @@ export declare function assembleShaderWGSL(platformInfo: PlatformInfo, options:
  * @param modules
  * @returns
  */
-export declare function assembleGetUniforms(modules: ShaderModuleInstance[]): (opts: Record<string, any>) => Record<string, any>;
+export declare function assembleGetUniforms(modules: ShaderModule[]): (opts: Record<string, any>) => Record<string, any>;
+/** Extracts the source code chunk for the specified shader type from the named shader module */
+export declare function getShaderModuleSource(module: ShaderModule, stage: 'vertex' | 'fragment' | 'wgsl'): string;
 export {};
 //# sourceMappingURL=assemble-shaders.d.ts.map

package/dist/lib/shader-assembly/assemble-shaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assemble-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-shaders.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-assembly/assemble-shaders.js

@@ -1,11 +1,11 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { glsl } from "../glsl-utils/highlight.js";
-import { resolveModules } from "./resolve-modules.js";
+import { getShaderModuleDependencies } from "../shader-module/shader-module-dependencies.js";
 import { getPlatformShaderDefines } from "./platform-defines.js";
 import { injectShader, DECLARATION_INJECT_MARKER } from "./shader-injections.js";
 import { transpileGLSLShader } from "../shader-transpiler/transpile-glsl-shader.js";
+import { checkShaderModuleDeprecations } from "../shader-module/shader-module.js";
 import { normalizeShaderHooks, getShaderHooks } from "./shader-hooks.js";
 import { assert } from "../utils/assert.js";
 import { getShaderInfo } from "../glsl-utils/get-shader-info.js";
@@ -14,14 +14,14 @@ const INJECT_SHADER_DECLARATIONS = `\n\n${DECLARATION_INJECT_MARKER}\n`;
  * Precision prologue to inject before functions are injected in shader
  * TODO - extract any existing prologue in the fragment source and move it up...
  */
-const FRAGMENT_SHADER_PROLOGUE = `\
+const FRAGMENT_SHADER_PROLOGUE = /* glsl */ `\
 precision highp float;
 `;
 /**
  * Inject a list of shader modules into a single shader source for WGSL
  */
 export function assembleWGSLShader(options) {
-    const modules = resolveModules(options.modules || []);
+    const modules = getShaderModuleDependencies(options.modules || []);
     return {
         source: assembleShaderWGSL(options.platformInfo, {
             ...options,
@@ -37,7 +37,7 @@ export function assembleWGSLShader(options) {
  */
 export function assembleGLSLShaderPair(options) {
     const { vs, fs } = options;
-    const modules = resolveModules(options.modules || []);
+    const modules = getShaderModuleDependencies(options.modules || []);
     return {
         vs: assembleShaderGLSL(options.platformInfo, {
             ...options,
@@ -120,15 +120,15 @@ export function assembleShaderWGSL(platformInfo, options) {
         }
     }
     // TODO - hack until shadertool modules support WebGPU
-    const modulesToInject = platformInfo.type !== 'webgpu' ? modules : [];
+    const modulesToInject = modules;
     for (const module of modulesToInject) {
         if (log) {
-            module.checkDeprecations(coreSource, log);
+            checkShaderModuleDeprecations(module, coreSource, log);
         }
-        const moduleSource = module.getModuleSource(stage, 'wgsl');
+        const moduleSource = getShaderModuleSource(module, 'wgsl');
         // Add the module source, and a #define that declares it presence
         assembledSource += moduleSource;
-        const injections = module.injections[stage];
+        const injections = module.injections?.[stage] || {};
         for (const key in injections) {
             const match = /^(v|f)s:#([\w-]+)$/.exec(key);
             if (match) {
@@ -172,7 +172,7 @@ function assembleShaderGLSL(platformInfo, options) {
     // Combine Module and Application Defines
     const allDefines = {};
     modules.forEach(module => {
-        Object.assign(allDefines, module.getDefines());
+        Object.assign(allDefines, module.defines);
     });
     Object.assign(allDefines, defines);
     // Add platform defines (use these to work around platform-specific bugs and limitations)
@@ -190,6 +190,7 @@ ${sourceVersionDirective}
 // ----- PROLOGUE -------------------------
 ${getShaderNameDefine({ id, source, stage })}
 ${`#define SHADER_TYPE_${stage.toUpperCase()}`}
+
 ${getPlatformShaderDefines(platformInfo)}
 ${stage === 'fragment' ? FRAGMENT_SHADER_PROLOGUE : ''}
 
@@ -208,7 +209,6 @@ ${getApplicationDefines(allDefines)}
     const declInjections = {};
     const mainInjections = {};
     for (const key in inject) {
-        // @ts-expect-error
         const injection = typeof inject[key] === 'string' ? { injection: inject[key], order: 0 } : inject[key];
         const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
         if (match) {
@@ -233,12 +233,12 @@ ${getApplicationDefines(allDefines)}
     }
     for (const module of modules) {
         if (log) {
-            module.checkDeprecations(coreSource, log);
+            checkShaderModuleDeprecations(module, coreSource, log);
         }
-        const moduleSource = module.getModuleSource(stage);
+        const moduleSource = getShaderModuleSource(module, stage);
         // Add the module source, and a #define that declares it presence
         assembledSource += moduleSource;
-        const injections = module.injections[stage];
+        const injections = module.instance?.normalizedInjections[stage] || {};
         for (const key in injections) {
             const match = /^(v|f)s:#([\w-]+)$/.exec(key);
             if (match) {
@@ -281,7 +281,7 @@ export function assembleGetUniforms(modules) {
         for (const module of modules) {
             // `modules` is already sorted by dependency level. This guarantees that
             // modules have access to the uniforms that are generated by their dependencies.
-            const moduleUniforms = module.getUniforms(opts, uniforms);
+            const moduleUniforms = module.getUniforms?.(opts, uniforms);
             Object.assign(uniforms, moduleUniforms);
         }
         return uniforms;
@@ -297,9 +297,7 @@ function getShaderNameDefine(options) {
     const injectShaderName = id && source.indexOf('SHADER_NAME') === -1;
     return injectShaderName
         ? `
-#define SHADER_NAME ${id}_${stage}
-
-`
+#define SHADER_NAME ${id}_${stage}`
         : '';
 }
 /** Generates application defines from an object of key value pairs */
@@ -313,6 +311,36 @@ function getApplicationDefines(defines = {}) {
     }
     return sourceText;
 }
+/** Extracts the source code chunk for the specified shader type from the named shader module */
+export function getShaderModuleSource(module, stage) {
+    let moduleSource;
+    switch (stage) {
+        case 'vertex':
+            moduleSource = module.vs || '';
+            break;
+        case 'fragment':
+            moduleSource = module.fs || '';
+            break;
+        case 'wgsl':
+            moduleSource = module.source || '';
+            break;
+        default:
+            assert(false);
+    }
+    if (!module.name) {
+        throw new Error('Shader module must have a name');
+    }
+    const moduleName = module.name.toUpperCase().replace(/[^0-9a-z]/gi, '_');
+    let source = `\
+// ----- MODULE ${module.name} ---------------
+
+`;
+    if (stage !== 'wgsl') {
+        source += `#define MODULE_${moduleName}\n`;
+    }
+    source += `${moduleSource}\n`;
+    return source;
+}
 /*
 function getHookFunctions(
   hookFunctions: Record<string, HookFunction>,

package/dist/lib/shader-assembly/platform-defines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-defines.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/platform-defines.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,gEAAgE;AAChE,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAkD3E"}
+{"version":3,"file":"platform-defines.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/platform-defines.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,gEAAgE;AAChE,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAkD3E"}

package/dist/lib/shader-assembly/platform-defines.js

@@ -1,42 +1,50 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { glsl } from "../glsl-utils/highlight.js";
 /** Adds defines to help identify GPU architecture / platform */
 export function getPlatformShaderDefines(platformInfo) {
     switch (platformInfo?.gpu.toLowerCase()) {
         case 'apple':
-            return `\
+            return /* glsl */ `\
 #define APPLE_GPU
+// Apple optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
 #define LUMA_FP32_TAN_PRECISION_WORKAROUND 1
+// Intel GPU doesn't have full 32 bits precision in same cases, causes overflow
 #define LUMA_FP64_HIGH_BITS_OVERFLOW_WORKAROUND 1
 `;
         case 'nvidia':
-            return `\
+            return /* glsl */ `\
 #define NVIDIA_GPU
+// Nvidia optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
 `;
         case 'intel':
-            return `\
+            return /* glsl */ `\
 #define INTEL_GPU
+// Intel optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
+// Intel's built-in 'tan' function doesn't have acceptable precision
 #define LUMA_FP32_TAN_PRECISION_WORKAROUND 1
+// Intel GPU doesn't have full 32 bits precision in same cases, causes overflow
 #define LUMA_FP64_HIGH_BITS_OVERFLOW_WORKAROUND 1
 `;
         case 'amd':
             // AMD Does not eliminate fp64 code
-            return `\
+            return /* glsl */ `\
 #define AMD_GPU
 `;
         default:
             // We don't know what GPU it is, could be that the GPU driver or
             // browser is not implementing UNMASKED_RENDERER constant and not
             // reporting a correct name
-            return `\
+            return /* glsl */ `\
 #define DEFAULT_GPU
+// Prevent driver from optimizing away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
+// Headless Chrome's software shader 'tan' function doesn't have acceptable precision
 #define LUMA_FP32_TAN_PRECISION_WORKAROUND 1
+// If the GPU doesn't have full 32 bits precision, will causes overflow
 #define LUMA_FP64_HIGH_BITS_OVERFLOW_WORKAROUND 1
 `;
     }

package/dist/lib/shader-module/shader-module-dependencies.d.ts

@@ -0,0 +1,53 @@
+import { ShaderModule } from "./shader-module.js";
+type AbstractModule = {
+    name: string;
+    dependencies?: AbstractModule[];
+};
+/**
+ * Takes a list of shader module names and returns a new list of
+ * shader module names that includes all dependencies, sorted so
+ * that modules that are dependencies of other modules come first.
+ *
+ * If the shader glsl code from the returned modules is concatenated
+ * in the reverse order, it is guaranteed that all functions be resolved and
+ * that all function and variable definitions come before use.
+ *
+ * @param modules - Array of modules (inline modules or module names)
+ * @return - Array of modules
+ */
+export declare function getShaderModuleDependencies<T extends AbstractModule>(modules: T[]): T[];
+/**
+ * Recursively checks module dependencies to calculate dependency level of each module.
+ *
+ * @param options.modules - Array of modules
+ * @param options.level - Current level
+ * @param options.moduleMap -
+ * @param options.moduleDepth - Current level
+ * @return - Map of module name to its level
+ */
+export declare function getDependencyGraph<T extends AbstractModule>(options: {
+    modules: T[];
+    level: number;
+    moduleMap: Record<string, T>;
+    moduleDepth: Record<string, number>;
+}): void;
+/**
+ * Takes a list of shader module names and returns a new list of
+ * shader module names that includes all dependencies, sorted so
+ * that modules that are dependencies of other modules come first.
+ *
+ * If the shader glsl code from the returned modules is concatenated
+ * in the reverse order, it is guaranteed that all functions be resolved and
+ * that all function and variable definitions come before use.
+ *
+ * @param modules - Array of modules (inline modules or module names)
+ * @return - Array of modules
+ */
+export declare function getShaderDependencies(modules: ShaderModule[]): ShaderModule[];
+/**
+ * Instantiate shader modules and resolve any dependencies
+ * @deprecated Use getShaderDpendencies
+ */
+export declare function resolveModules(modules: ShaderModule[]): ShaderModule[];
+export {};
+//# sourceMappingURL=shader-module-dependencies.d.ts.map

package/dist/lib/shader-module/shader-module-dependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module-dependencies.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAA0B,2BAAwB;AAItE,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,cAAc,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAYvF;AAED;;;;;;;;GAQG;AAEH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE;IACpE,OAAO,EAAE,CAAC,EAAE,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,QAoBA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CAY7E;AAID;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CAEtE"}