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

package/dist/modules-webgl1/project/project.d.ts

@@ -11,8 +11,8 @@ declare function getUniforms(opts?: ProjectionProps, prevUniforms?: {}): Record<
 export declare const project: {
     readonly name: "project";
     readonly getUniforms: typeof getUniforms;
-    readonly vs: string;
-    readonly fs: string;
+    readonly vs: "varying vec4 project_vPositionWorld;\nvarying vec3 project_vNormalWorld;\n\nvec4 project_getPosition_World() {\n  return project_vPositionWorld;\n}\n\nvec3 project_getNormal_World() {\n  return project_vNormalWorld;\n}\n\n\n// Unprefixed uniforms\nuniform mat4 modelMatrix;\nuniform mat4 viewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewProjectionMatrix;\nuniform vec3 cameraPositionWorld;\n\nstruct World {\n  vec3 position;\n  vec3 normal;\n};\n\nWorld world;\n\nvoid project_setPosition(vec4 position) {\n  project_vPositionWorld = position;\n}\n\nvoid project_setNormal(vec3 normal) {\n  project_vNormalWorld = normal;\n}\n\nvoid project_setPositionAndNormal_World(vec3 position, vec3 normal) {\n  world.position = position;\n  world.normal = normal;\n}\n\nvoid project_setPositionAndNormal_Model(vec3 position, vec3 normal) {\n  world.position = (modelMatrix * vec4(position, 1.)).xyz;\n  world.normal = mat3(modelMatrix) * normal;\n}\n\nvec4 project_model_to_clipspace(vec4 position) {\n  return viewProjectionMatrix * modelMatrix * position;\n}\n\nvec4 project_model_to_clipspace(vec3 position) {\n  return viewProjectionMatrix * modelMatrix * vec4(position, 1.);\n}\n\nvec4 project_world_to_clipspace(vec3 position) {\n  return viewProjectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_view_to_clipspace(vec3 position) {\n  return projectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_to_clipspace(vec3 position) {\n  return viewProjectionMatrix * vec4(position, 1.);\n}\n";
+    readonly fs: "\nvarying vec4 project_vPositionWorld;\nvarying vec3 project_vNormalWorld;\n\nvec4 project_getPosition_World() {\n  return project_vPositionWorld;\n}\n\nvec3 project_getNormal_World() {\n  return project_vNormalWorld;\n}\n";
 };
 export {};
 //# sourceMappingURL=project.d.ts.map

package/dist/modules-webgl1/project/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/modules-webgl1/project/project.ts"],"names":[],"mappings":"AAQA,KAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAWF,iBAAS,WAAW,CAAC,IAAI,GAAE,eAAwC,EAAE,YAAY,KAAK,uBA2BrF;AA2ED;;GAEG;AACH,eAAO,MAAM,OAAO;;;;;CAK+C,CAAC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/modules-webgl1/project/project.ts"],"names":[],"mappings":"AAOA,KAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAWF,iBAAS,WAAW,CAAC,IAAI,GAAE,eAAwC,EAAE,YAAY,KAAK,uBA2BrF;AA2ED;;GAEG;AACH,eAAO,MAAM,OAAO;;;;;CAK+C,CAAC"}

package/dist/modules-webgl1/project/project.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Matrix4 } from '@math.gl/core';
-import { glsl } from "../../lib/glsl-utils/highlight.js";
 const IDENTITY_MATRIX = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 const DEFAULT_MODULE_OPTIONS = {
     modelMatrix: IDENTITY_MATRIX,
@@ -33,14 +32,16 @@ function getUniforms(opts = DEFAULT_MODULE_OPTIONS, prevUniforms = {}) {
     }
     return uniforms;
 }
-const common = `\
+const common = /* glsl */ `\
 varying vec4 project_vPositionWorld;
 varying vec3 project_vNormalWorld;
+
 vec4 project_getPosition_World() {
-return project_vPositionWorld;
+  return project_vPositionWorld;
 }
+
 vec3 project_getNormal_World() {
-return project_vNormalWorld;
+  return project_vNormalWorld;
 }
 `;
 const vs = `\

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.1.0-alpha.1",
+  "version": "9.1.0-alpha.12",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -46,12 +46,12 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta"
+    "@luma.gl/core": "9.1.0-alpha.10"
   },
   "dependencies": {
-    "@math.gl/core": "^4.0.0",
-    "@math.gl/types": "^4.0.0",
+    "@math.gl/core": "4.1.0-alpha.3",
+    "@math.gl/types": "4.1.0-alpha.3",
     "wgsl_reflect": "^1.0.1"
   },
-  "gitHead": "bc5c11c87f1e4db857e701688ca1410d7f51fd0f"
+  "gitHead": "61b0080d5beb5284b8bdcec5cf59e13cda65295a"
 }

package/src/index.ts

@@ -8,20 +8,27 @@
  * Marks GLSL shaders for syntax highlighting: glsl`...`
  * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
  */
-export {glsl} from './lib/glsl-utils/highlight';
-
 export type {PlatformInfo} from './lib/shader-assembly/platform-info';
 
+// ShaderModules
+
 export type {ShaderModule} from './lib/shader-module/shader-module';
 export type {ShaderPass} from './lib/shader-module/shader-pass';
-export type {ShaderHook} from './lib/shader-assembly/shader-hooks';
-export type {ShaderInjection} from './lib/shader-assembly/shader-injections';
-export {ShaderModuleInstance} from './lib/shader-module/shader-module-instance';
+
+export {initializeShaderModule, initializeShaderModules} from './lib/shader-module/shader-module';
+export {getShaderModuleUniforms} from './lib/shader-module/shader-module';
+export {getShaderModuleDependencies} from './lib/shader-module/shader-module-dependencies';
+export {checkShaderModuleDeprecations} from './lib/shader-module/shader-module';
+
+export {getShaderModuleSource} from './lib/shader-assembly/assemble-shaders';
+
+export {resolveModules as _resolveModules} from './lib/shader-module/shader-module-dependencies';
+export {getDependencyGraph as _getDependencyGraph} from './lib/shader-module/shader-module-dependencies';
 
 // ShaderAssembler
 export {ShaderAssembler} from './lib/shader-assembler';
-
-export {normalizeShaderModule} from './lib/shader-module/normalize-shader-module';
+export type {ShaderHook} from './lib/shader-assembly/shader-hooks';
+export type {ShaderInjection} from './lib/shader-assembly/shader-injections';
 
 // SHADER HELPERS
 
@@ -43,10 +50,7 @@ export {capitalize} from './lib/shader-generator/utils/capitalize';
 // TEST EXPORTS - Do not use in production applications
 export {preprocess} from './lib/preprocessor/preprocessor';
 export {assembleGLSLShaderPair} from './lib/shader-assembly/assemble-shaders';
-export {ShaderModuleInstance as _ShaderModuleInstance} from './lib/shader-module/shader-module-instance';
 export {combineInjects} from './lib/shader-assembly/shader-injections';
-export {resolveModules as _resolveModules} from './lib/shader-assembly/resolve-modules';
-export {getDependencyGraph as _getDependencyGraph} from './lib/shader-assembly/resolve-modules';
 
 // EXPERIMENTAL WGSL
 export {getShaderLayoutFromWGSL} from './lib/wgsl/get-shader-layout-wgsl';
@@ -66,11 +70,11 @@ export {fp32} from './modules/math/fp32/fp32';
 // // projection
 // export type {ProjectionUniforms} from './modules/engine/project/project';
 // export {projection} from './modules/engine/project/project';
-export type {PickingProps} from './modules/engine/picking/picking';
+export type {PickingProps, PickingUniforms} from './modules/engine/picking/picking';
 export {picking} from './modules/engine/picking/picking';
 
 // // lighting
-export type {LightingProps} from './modules/lighting/lights/lighting';
+export type {LightingProps, LightingUniforms} from './modules/lighting/lights/lighting';
 export {lighting} from './modules/lighting/lights/lighting';
 export {dirlight} from './modules/lighting/no-material/dirlight';
 export type {PhongMaterialUniforms as GouraudMaterialUniforms} from './modules/lighting/phong-material/phong-material';
@@ -83,55 +87,97 @@ export {pbrMaterial} from './modules/lighting/pbr-material/pbr-material';
 // POST PROCESSING / SHADER PASS MODULES
 
 // glfx image adjustment shader modules
-export type {BrightnessContrastProps} from './modules/postprocessing/image-adjust-filters/brightnesscontrast';
+export type {
+  BrightnessContrastProps,
+  BrightnessContrastUniforms
+} from './modules/postprocessing/image-adjust-filters/brightnesscontrast';
 export {brightnessContrast} from './modules/postprocessing/image-adjust-filters/brightnesscontrast';
-export type {DenoiseProps} from './modules/postprocessing/image-adjust-filters/denoise';
+export type {
+  DenoiseProps,
+  DenoiseUniforms
+} from './modules/postprocessing/image-adjust-filters/denoise';
 export {denoise} from './modules/postprocessing/image-adjust-filters/denoise';
-export type {HueSaturationProps} from './modules/postprocessing/image-adjust-filters/huesaturation';
+export type {
+  HueSaturationProps,
+  HueSaturationUniforms
+} from './modules/postprocessing/image-adjust-filters/huesaturation';
 export {hueSaturation} from './modules/postprocessing/image-adjust-filters/huesaturation';
-export type {NoiseProps} from './modules/postprocessing/image-adjust-filters/noise';
+export type {NoiseProps, NoiseUniforms} from './modules/postprocessing/image-adjust-filters/noise';
 export {noise} from './modules/postprocessing/image-adjust-filters/noise';
-export type {SepiaProps} from './modules/postprocessing/image-adjust-filters/sepia';
+export type {SepiaProps, SepiaUniforms} from './modules/postprocessing/image-adjust-filters/sepia';
 export {sepia} from './modules/postprocessing/image-adjust-filters/sepia';
-export type {VibranceProps} from './modules/postprocessing/image-adjust-filters/vibrance';
+export type {
+  VibranceProps,
+  VibranceUniforms
+} from './modules/postprocessing/image-adjust-filters/vibrance';
 export {vibrance} from './modules/postprocessing/image-adjust-filters/vibrance';
-export type {VignetteProps} from './modules/postprocessing/image-adjust-filters/vignette';
+export type {
+  VignetteProps,
+  VignetteUniforms
+} from './modules/postprocessing/image-adjust-filters/vignette';
 export {vignette} from './modules/postprocessing/image-adjust-filters/vignette';
 
 // glfx  BLUR shader modules
-export type {TiltShiftProps} from './modules/postprocessing/image-blur-filters/tiltshift';
+export type {
+  TiltShiftProps,
+  TiltShiftUniforms
+} from './modules/postprocessing/image-blur-filters/tiltshift';
 export {tiltShift} from './modules/postprocessing/image-blur-filters/tiltshift';
-export type {TriangleBlurProps} from './modules/postprocessing/image-blur-filters/triangleblur';
+export type {
+  TriangleBlurProps,
+  TriangleBlurUniforms
+} from './modules/postprocessing/image-blur-filters/triangleblur';
 export {triangleBlur} from './modules/postprocessing/image-blur-filters/triangleblur';
-export type {ZoomBlurProps} from './modules/postprocessing/image-blur-filters/zoomblur';
+export type {
+  ZoomBlurProps,
+  ZoomBlurUniforms
+} from './modules/postprocessing/image-blur-filters/zoomblur';
 export {zoomBlur} from './modules/postprocessing/image-blur-filters/zoomblur';
 
 // glfx FUN shader modules
-export type {ColorHalftoneProps} from './modules/postprocessing/image-fun-filters/colorhalftone';
+export type {
+  ColorHalftoneProps,
+  ColorHalftoneUniforms
+} from './modules/postprocessing/image-fun-filters/colorhalftone';
 export {colorHalftone} from './modules/postprocessing/image-fun-filters/colorhalftone';
-export type {DotScreenProps} from './modules/postprocessing/image-fun-filters/dotscreen';
+export type {
+  DotScreenProps,
+  DotScreenUniforms
+} from './modules/postprocessing/image-fun-filters/dotscreen';
 export {dotScreen} from './modules/postprocessing/image-fun-filters/dotscreen';
-export type {EdgeWorkProps} from './modules/postprocessing/image-fun-filters/edgework';
+export type {
+  EdgeWorkProps,
+  EdgeWorkUniforms
+} from './modules/postprocessing/image-fun-filters/edgework';
 export {edgeWork} from './modules/postprocessing/image-fun-filters/edgework';
-export type {HexagonalPixelateProps} from './modules/postprocessing/image-fun-filters/hexagonalpixelate';
+export type {
+  HexagonalPixelateProps,
+  HexagonalPixelateUniforms
+} from './modules/postprocessing/image-fun-filters/hexagonalpixelate';
 export {hexagonalPixelate} from './modules/postprocessing/image-fun-filters/hexagonalpixelate';
-export type {InkProps} from './modules/postprocessing/image-fun-filters/ink';
+export type {InkProps, InkUniforms} from './modules/postprocessing/image-fun-filters/ink';
 export {ink} from './modules/postprocessing/image-fun-filters/ink';
-export type {MagnifyProps} from './modules/postprocessing/image-fun-filters/magnify';
+export type {
+  MagnifyProps,
+  MagnifyUniforms
+} from './modules/postprocessing/image-fun-filters/magnify';
 export {magnify} from './modules/postprocessing/image-fun-filters/magnify';
 
 // glfx  WARP shader modules
-export type {BulgePinchProps} from './modules/postprocessing/image-warp-filters/bulgepinch';
+export type {
+  BulgePinchProps,
+  BulgePinchUniforms
+} from './modules/postprocessing/image-warp-filters/bulgepinch';
 export {bulgePinch} from './modules/postprocessing/image-warp-filters/bulgepinch';
-export type {SwirlProps} from './modules/postprocessing/image-warp-filters/swirl';
+export type {SwirlProps, SwirlUniforms} from './modules/postprocessing/image-warp-filters/swirl';
 export {swirl} from './modules/postprocessing/image-warp-filters/swirl';
 
 // 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';
 
 // experimental modules
-export type {WarpProps} from './modules/postprocessing/image-warp-filters/warp';
+export type {WarpProps, WarpUniforms} from './modules/postprocessing/image-warp-filters/warp';
 export {warp as _warp} from './modules/postprocessing/image-warp-filters/warp';
 
 // DEPRECATED - v8 legacy shader modules (non-uniform buffer)

package/src/lib/glsl-utils/shader-utils.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from './highlight';
-
-const FS_GLES = glsl`\
+const FS_GLES = /* glsl */ `\
 out vec4 transform_output;
 void main() {
   transform_output = vec4(0);

package/src/lib/shader-assembler.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {ShaderModule} from './shader-module/shader-module';
-import {ShaderModuleInstance} from './shader-module/shader-module-instance';
+import {initializeShaderModules} from './shader-module/shader-module';
 import {
   AssembleShaderProps,
   GetUniformsFunc,
@@ -76,7 +76,7 @@ export class ShaderAssembler {
   assembleWGSLShader(props: AssembleShaderProps): {
     source: string;
     getUniforms: GetUniformsFunc;
-    modules: ShaderModuleInstance[];
+    modules: ShaderModule[];
   } {
     const modules = this._getModuleList(props.modules); // Combine with default modules
     const hookFunctions = this._hookFunctions; // TODO - combine with default hook functions
@@ -103,7 +103,7 @@ export class ShaderAssembler {
     vs: string;
     fs: string;
     getUniforms: GetUniformsFunc;
-    modules: ShaderModuleInstance[];
+    modules: ShaderModule[];
   } {
     const modules = this._getModuleList(props.modules); // Combine with default modules
     const hookFunctions = this._hookFunctions; // TODO - combine with default hook functions
@@ -123,10 +123,8 @@ export class ShaderAssembler {
   /**
    * Dedupe and combine with default modules
    */
-  _getModuleList(appModules: (ShaderModule | ShaderModuleInstance)[] = []): ShaderModuleInstance[] {
-    const modules = new Array<ShaderModule | ShaderModuleInstance>(
-      this._defaultModules.length + appModules.length
-    );
+  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {
+    const modules = new Array<ShaderModule>(this._defaultModules.length + appModules.length);
     const seen: Record<string, boolean> = {};
     let count = 0;
 
@@ -148,6 +146,7 @@ export class ShaderAssembler {
 
     modules.length = count;
 
-    return ShaderModuleInstance.instantiateModules(modules);
+    initializeShaderModules(modules);
+    return modules;
   }
 }

package/src/lib/shader-assembly/assemble-shaders.ts

@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../glsl-utils/highlight';
-import {resolveModules} from './resolve-modules';
+import {getShaderModuleDependencies} from '../shader-module/shader-module-dependencies';
 import {PlatformInfo} from './platform-info';
 import {getPlatformShaderDefines} from './platform-defines';
 import {injectShader, DECLARATION_INJECT_MARKER} from './shader-injections';
 import {transpileGLSLShader} from '../shader-transpiler/transpile-glsl-shader';
-import {ShaderModuleInstance} from '../shader-module/shader-module-instance';
+import {checkShaderModuleDeprecations} from '../shader-module/shader-module';
 import type {ShaderInjection} from './shader-injections';
 import type {ShaderModule} from '../shader-module/shader-module';
 import {ShaderHook, normalizeShaderHooks, getShaderHooks} from './shader-hooks';
@@ -24,7 +23,7 @@ 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 = glsl`\
+const FRAGMENT_SHADER_PROLOGUE = /* glsl */ `\
 precision highp float;
 `;
 
@@ -47,7 +46,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 */
@@ -99,7 +98,8 @@ export function assembleWGSLShader(
   source: string;
   getUniforms: GetUniformsFunc;
 } {
-  const modules = resolveModules(options.modules || []);
+  const modules = getShaderModuleDependencies(options.modules || []);
+
   return {
     source: assembleShaderWGSL(options.platformInfo, {
       ...options,
@@ -127,7 +127,7 @@ export function assembleGLSLShaderPair(
   getUniforms: GetUniformsFunc;
 } {
   const {vs, fs} = options;
-  const modules = resolveModules(options.modules || []);
+  const modules = getShaderModuleDependencies(options.modules || []);
 
   return {
     vs: assembleShaderGLSL(options.platformInfo, {
@@ -224,17 +224,17 @@ export function assembleShaderWGSL(platformInfo: PlatformInfo, options: Assemble
   }
 
   // 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) {
@@ -279,7 +279,7 @@ function assembleShaderGLSL(
     source: string;
     language?: 'glsl' | 'wgsl';
     stage: 'vertex' | 'fragment';
-    modules: ShaderModuleInstance[];
+    modules: ShaderModule[];
     defines?: Record<string, ShaderDefine>;
     hookFunctions?: any[];
     inject?: Record<string, string | ShaderInjection>;
@@ -314,7 +314,7 @@ function assembleShaderGLSL(
   // Combine Module and Application Defines
   const allDefines = {};
   modules.forEach(module => {
-    Object.assign(allDefines, module.getDefines());
+    Object.assign(allDefines, module.defines);
   });
   Object.assign(allDefines, defines);
 
@@ -333,6 +333,7 @@ ${sourceVersionDirective}
 // ----- PROLOGUE -------------------------
 ${getShaderNameDefine({id, source, stage})}
 ${`#define SHADER_TYPE_${stage.toUpperCase()}`}
+
 ${getPlatformShaderDefines(platformInfo)}
 ${stage === 'fragment' ? FRAGMENT_SHADER_PROLOGUE : ''}
 
@@ -354,7 +355,6 @@ ${getApplicationDefines(allDefines)}
   const mainInjections: Record<string, ShaderInjection[]> = {};
 
   for (const key in inject) {
-    // @ts-expect-error
     const injection: ShaderInjection =
       typeof inject[key] === 'string' ? {injection: inject[key], order: 0} : inject[key];
     const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
@@ -378,13 +378,13 @@ ${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) {
@@ -429,13 +429,13 @@ ${getApplicationDefines(allDefines)}
  * @param modules
  * @returns
  */
-export function assembleGetUniforms(modules: ShaderModuleInstance[]) {
+export function assembleGetUniforms(modules: ShaderModule[]) {
   return function getUniforms(opts: Record<string, any>): Record<string, any> {
     const uniforms = {};
     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;
@@ -456,9 +456,7 @@ function getShaderNameDefine(options: {
   const injectShaderName = id && source.indexOf('SHADER_NAME') === -1;
   return injectShaderName
     ? `
-#define SHADER_NAME ${id}_${stage}
-
-`
+#define SHADER_NAME ${id}_${stage}`
     : '';
 }
 
@@ -474,6 +472,41 @@ function getApplicationDefines(defines: Record<string, ShaderDefine> = {}): stri
   return sourceText;
 }
 
+/** Extracts the source code chunk for the specified shader type from the named shader module */
+export function getShaderModuleSource(
+  module: ShaderModule,
+  stage: 'vertex' | 'fragment' | 'wgsl'
+): string {
+  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/src/lib/shader-assembly/platform-defines.ts

@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../glsl-utils/highlight';
 import {PlatformInfo} from './platform-info';
 
 /** Adds defines to help identify GPU architecture / platform */
 export function getPlatformShaderDefines(platformInfo: PlatformInfo): string {
   switch (platformInfo?.gpu.toLowerCase()) {
     case 'apple':
-      return glsl`\
+      return /* glsl */ `\
 #define APPLE_GPU
 // Apple optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
@@ -19,14 +18,14 @@ export function getPlatformShaderDefines(platformInfo: PlatformInfo): string {
 `;
 
     case 'nvidia':
-      return glsl`\
+      return /* glsl */ `\
 #define NVIDIA_GPU
 // Nvidia optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
 `;
 
     case 'intel':
-      return glsl`\
+      return /* glsl */ `\
 #define INTEL_GPU
 // Intel optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
@@ -38,7 +37,7 @@ export function getPlatformShaderDefines(platformInfo: PlatformInfo): string {
 
     case 'amd':
       // AMD Does not eliminate fp64 code
-      return glsl`\
+      return /* glsl */ `\
 #define AMD_GPU
 `;
 
@@ -46,7 +45,7 @@ export function getPlatformShaderDefines(platformInfo: PlatformInfo): string {
       // 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 glsl`\
+      return /* glsl */ `\
 #define DEFAULT_GPU
 // Prevent driver from optimizing away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1

package/src/lib/shader-module/shader-module-dependencies.ts

@@ -0,0 +1,111 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {ShaderModule, initializeShaderModules} from './shader-module';
+
+// import type {ShaderModule} from '../shader-module/shader-module';
+
+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 function getShaderModuleDependencies<T extends AbstractModule>(modules: T[]): T[] {
+  initializeShaderModules(modules);
+  const moduleMap: Record<string, T> = {};
+  const moduleDepth: Record<string, number> = {};
+  getDependencyGraph({modules, level: 0, moduleMap, moduleDepth});
+
+  // Return a reverse sort so that dependencies come before the modules that use them
+  const dependencies = Object.keys(moduleDepth)
+    .sort((a, b) => moduleDepth[b] - moduleDepth[a])
+    .map(name => moduleMap[name]);
+  initializeShaderModules(dependencies);
+  return dependencies;
+}
+
+/**
+ * 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
+ */
+// Adds another level of dependencies to the result map
+export function getDependencyGraph<T extends AbstractModule>(options: {
+  modules: T[];
+  level: number;
+  moduleMap: Record<string, T>;
+  moduleDepth: Record<string, number>;
+}) {
+  const {modules, level, moduleMap, moduleDepth} = options;
+  if (level >= 5) {
+    throw new Error('Possible loop in shader dependency graph');
+  }
+
+  // Update level on all current modules
+  for (const module of modules) {
+    moduleMap[module.name] = module;
+    if (moduleDepth[module.name] === undefined || moduleDepth[module.name] < level) {
+      moduleDepth[module.name] = level;
+    }
+  }
+
+  // Recurse
+  for (const module of modules) {
+    if (module.dependencies) {
+      getDependencyGraph({modules: module.dependencies, level: level + 1, moduleMap, moduleDepth});
+    }
+  }
+}
+
+/**
+ * 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 function getShaderDependencies(modules: ShaderModule[]): ShaderModule[] {
+  initializeShaderModules(modules);
+  const moduleMap: Record<string, ShaderModule> = {};
+  const moduleDepth: Record<string, number> = {};
+  getDependencyGraph({modules, level: 0, moduleMap, moduleDepth});
+
+  // Return a reverse sort so that dependencies come before the modules that use them
+  modules = Object.keys(moduleDepth)
+    .sort((a, b) => moduleDepth[b] - moduleDepth[a])
+    .map(name => moduleMap[name]);
+  initializeShaderModules(modules);
+  return modules;
+}
+
+// DEPRECATED
+
+/**
+ * Instantiate shader modules and resolve any dependencies
+ * @deprecated Use getShaderDpendencies
+ */
+export function resolveModules(modules: ShaderModule[]): ShaderModule[] {
+  return getShaderDependencies(modules);
+}