Revert "shadertools: Resolve dependencies in ShaderInputs (#2073)"

This reverts commit 11efb29.
visgl · Apr 25, 2024 · 4a1cc64 · 4a1cc64
1 parent 11efb29
commit 4a1cc64
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 73 deletions.
diff --git a/modules/engine/src/shader-inputs.ts b/modules/engine/src/shader-inputs.ts
@@ -61,22 +61,17 @@ export class ShaderInputs<
    * @param modules
    */
   // @ts-expect-error Fix typings
-  constructor(modules: {[P in keyof ShaderPropsT]?: ShaderModuleInputs<ShaderPropsT[P]>}) {
-    // Extract modules with dependencies
-    const resolvedModules = _resolveModules(
-      Object.values(modules).filter(module => module.dependencies),
-      false
-    );
-    for (const resolvedModule of resolvedModules) {
-      // @ts-expect-error Fix typings
-      modules[resolvedModule.name] = resolvedModule;
-    }
-
-    log.log(1, 'Creating ShaderInputs with modules', Object.keys(modules))();
+  constructor(modules: {[P in keyof ShaderPropsT]: ShaderModuleInputs<ShaderPropsT[P]>}) {
+    // TODO - get all dependencies from modules
+    const allModules = _resolveModules(Object.values(modules));
+    log.log(
+      1,
+      'Creating ShaderInputs with modules',
+      allModules.map(m => m.name)
+    )();
 
     // Store the module definitions and create storage for uniform values and binding values, per module
-    // @ts-expect-error Fix typings
-    this.modules = modules as {[P in keyof ShaderPropsT]: ShaderModuleInputs<ShaderPropsT[P]>};
+    this.modules = modules;
     this.moduleUniforms = {} as Record<keyof ShaderPropsT, Record<string, UniformValue>>;
     this.moduleBindings = {} as Record<keyof ShaderPropsT, Record<string, Texture | Sampler>>;
 

diff --git a/modules/engine/test/shader-inputs.spec.ts b/modules/engine/test/shader-inputs.spec.ts
@@ -6,7 +6,6 @@ import test from 'tape-promise/tape';
 import {picking} from '../../shadertools/src/index';
 // import {_ShaderInputs as ShaderInputs} from '@luma.gl/engine';
 import {ShaderInputs} from '../src/shader-inputs';
-import {ShaderModule} from '@luma.gl/shadertools';
 
 test('ShaderInputs#picking', t => {
   const shaderInputsUntyped = new ShaderInputs({picking});
@@ -63,33 +62,3 @@ test('ShaderInputs#picking prop merge', t => {
 
   t.end();
 });
-
-test('ShaderInputs#dependencies', t => {
-  type CustomProps = {color: number[]};
-  const custom: ShaderModule<CustomProps> = {
-    name: 'custom',
-    dependencies: [picking],
-    uniformTypes: {
-      color: 'vec3<f32>'
-    }
-  };
-
-  const shaderInputs = new ShaderInputs<{
-    custom: CustomProps;
-    picking: typeof picking.props;
-  }>({custom});
-  t.deepEqual(Object.keys(shaderInputs.modules), ['custom', 'picking']);
-
-  shaderInputs.setProps({
-    custom: {color: [255, 0, 0]},
-    picking: {highlightedObjectColor: [1, 2, 3]}
-  });
-  t.deepEqual(shaderInputs.moduleUniforms.custom.color, [255, 0, 0], 'custom color updated');
-  t.deepEqual(
-    shaderInputs.moduleUniforms.picking.highlightedObjectColor,
-    [1, 2, 3],
-    'highlight object color updated'
-  );
-
-  t.end();
-});
diff --git a/modules/shadertools/src/lib/shader-assembly/resolve-modules.ts b/modules/shadertools/src/lib/shader-assembly/resolve-modules.ts
@@ -6,34 +6,15 @@ import type {ShaderModule} from '../shader-module/shader-module';
 import {ShaderModuleInstance} from '../shader-module/shader-module-instance';
 
 /**
- * Resolve any dependencies and optionally instantiate modules
+ * Instantiate shader modules and esolve any dependencies
  */
 export function resolveModules(
   modules: (ShaderModule | ShaderModuleInstance)[]
-): ShaderModuleInstance[];
-export function resolveModules(
-  modules: (ShaderModule | ShaderModuleInstance)[],
-  instantiate: true
-): ShaderModuleInstance[];
-export function resolveModules(modules: ShaderModule[], instantiate: false): ShaderModule[];
-export function resolveModules(
-  modules: ShaderModuleInstance[],
-  instantiate: false
-): ShaderModuleInstance[];
-export function resolveModules(
-  modules: (ShaderModule | ShaderModuleInstance)[],
-  instantiate: boolean = true
-): (ShaderModule | ShaderModuleInstance)[] {
-  return getShaderDependencies(
-    instantiate === false ? modules : ShaderModuleInstance.instantiateModules(modules)
-  );
+): ShaderModuleInstance[] {
+  const instances = ShaderModuleInstance.instantiateModules(modules);
+  return getShaderDependencies(instances);
 }
 
-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
@@ -46,8 +27,8 @@ type AbstractModule = {
  * @param modules - Array of modules (inline modules or module names)
  * @return - Array of modules
  */
-function getShaderDependencies<T extends AbstractModule>(modules: T[]): T[] {
-  const moduleMap: Record<string, T> = {};
+function getShaderDependencies(modules: ShaderModuleInstance[]): ShaderModuleInstance[] {
+  const moduleMap: Record<string, ShaderModuleInstance> = {};
   const moduleDepth: Record<string, number> = {};
   getDependencyGraph({modules, level: 0, moduleMap, moduleDepth});
 
@@ -67,10 +48,10 @@ function getShaderDependencies<T extends AbstractModule>(modules: T[]): T[] {
  * @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[];
+export function getDependencyGraph(options: {
+  modules: ShaderModuleInstance[];
   level: number;
-  moduleMap: Record<string, T>;
+  moduleMap: Record<string, ShaderModuleInstance>;
   moduleDepth: Record<string, number>;
 }) {
   const {modules, level, moduleMap, moduleDepth} = options;