@luma.gl/engine 8.6.0-alpha.5 → 9.0.0-alpha.3

package/src/lib/pipeline-factory.ts

@@ -0,0 +1,225 @@
+import type {RenderPipelineProps, RenderPipelineParameters} from '@luma.gl/api';
+import {Device, RenderPipeline, ComputePipeline} from '@luma.gl/api/';
+import type { ShaderModule } from '@luma.gl/shadertools';
+import {assembleShaders} from '@luma.gl/shadertools';
+
+export type GetRenderPipelineOptions = {
+  vs: string,
+  fs: string,
+  topology;
+  parameters?: RenderPipelineParameters;
+
+  modules?: ShaderModule[];
+  defines?: Record<string, string>,
+  inject?: Record<string, string>,
+  transpileToGLSL100?: boolean;
+
+  varyings?: string[],
+  bufferMode?: number,  
+};
+
+export type GetComputePipelineOptions = {
+  cs: string,
+  parameters?: RenderPipelineParameters;
+
+  modules?: ShaderModule[];
+  defines?: Record<string, string>,
+  inject?: Record<string, string>,
+  transpileToGLSL100?: boolean;
+
+  varyings?: string[],
+  bufferMode?: number,
+};
+
+const DEFAULT_RENDER_PIPELINE_OPTIONS: Required<GetRenderPipelineOptions> = {
+  vs: '',
+  fs: '',
+  modules: [],
+  defines: {},
+  inject: {},
+  transpileToGLSL100: false,
+
+  varyings: [],
+  bufferMode: 0x8c8d, // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS
+  topology: 'triangle-list',
+  parameters: {} 
+};
+
+/** Efficiently create shared pipelines with varying parameters */
+export default class PipelineFactory {
+  readonly device: Device;
+
+  stateHash: number = 0; // Used to change hashing if hooks are modified
+  private _hashCounter: number = 0;
+  private readonly _hashes: Record<string, number> = {};
+  private readonly _useCounts: Record<string, number> = {};
+
+  private readonly _pipelineCache: Record<string, RenderPipeline> = {};
+
+  private readonly _getUniforms: Record<string, any> = {};
+  private readonly _hookFunctions: any[] = [];
+  private _defaultModules: any[] = [];
+  // private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl
+
+  static getDefaultPipelineFactory(device: Device): PipelineFactory {
+    // @ts-expect-error Add to device
+    device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);
+    // @ts-expect-error Add to device
+    return device.defaultPipelineFactory;
+  }
+
+  constructor(device: Device) {
+    this.device = device;
+  }
+
+  // addDefaultModule(module: ShaderModule): void {
+  //   if (!this._defaultModules.find((m) => m.name === (typeof module === 'string' ? module : module.name))) {
+  //     this._defaultModules.push(module);
+  //   }
+  //   this.stateHash++;
+  // }
+
+  // removeDefaultModule(module: ShaderModule): void {
+  //   const moduleName = typeof module === 'string' ? module : module.name;
+  //   this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);
+  //   this.stateHash++;
+  // }
+
+  addShaderHook(hook, opts?): void {
+    if (opts) {
+      hook = Object.assign(opts, {hook});
+    }
+    this._hookFunctions.push(hook);
+    this.stateHash++;
+  }
+
+  createRenderPipeline(options: GetRenderPipelineOptions): {
+    renderPipeline: RenderPipeline;
+    getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>;
+  } {
+    const props: Required<GetRenderPipelineOptions> = {...DEFAULT_RENDER_PIPELINE_OPTIONS, ...options};
+
+    const modules = this._getModuleList(props.modules); // Combine with default modules
+
+    const hash = this._hashRenderPipeline({...props, modules});
+
+    if (!this._pipelineCache[hash]) {
+      const {renderPipeline, getUniforms} = this._createRenderPipeline({...props, modules});
+      renderPipeline.hash = hash;
+      this._pipelineCache[hash] = renderPipeline;
+      this._getUniforms[hash] = getUniforms || ((x: Record<string, Record<string, any>>) => {});
+      this._useCounts[hash] = 0;
+    }
+
+    this._useCounts[hash]++;
+
+    return {
+      renderPipeline: this._pipelineCache[hash],
+      getUniforms: this._getUniforms[hash]
+    };
+  }
+
+  release(pipeline: RenderPipeline): void {
+    const hash = pipeline.hash;
+    this._useCounts[hash]--;
+    if (this._useCounts[hash] === 0) {
+      this._pipelineCache[hash].destroy();
+      delete this._pipelineCache[hash];
+      delete this._getUniforms[hash];
+      delete this._useCounts[hash];
+    }
+  }
+
+  getUniforms(pipeline: RenderPipeline) {
+    return this._getUniforms[pipeline.hash] || null;
+  }
+
+  // PRIVATE
+
+  _createRenderPipeline(props: GetRenderPipelineOptions): {
+    renderPipeline: RenderPipeline,
+    getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>
+  } {
+    const platformInfo = {
+      gpu: this.device.info.gpu,
+      features: this.device.features
+    };
+
+    const assembled = assembleShaders(platformInfo, {...props, hookFunctions: this._hookFunctions});
+
+    const renderPipeline = this.device.createRenderPipeline({
+      ...props,
+      vs: this.device.createShader({stage: 'vertex', source: assembled.vs}),
+      fs: assembled.fs && this.device.createShader({stage: 'fragment', source: assembled.fs}),
+    });
+
+    return {renderPipeline, getUniforms: assembled.getUniforms};
+  }
+
+  /** Calculate a hash based on all the inputs for a render pipeline */
+  _hashRenderPipeline(props: GetRenderPipelineOptions): string {
+    const vsHash = this._getHash(props.vs);
+    const fsHash = this._getHash(props.fs);
+
+    const moduleHashes = props.modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();
+    const varyingHashes = props.varyings.map((v) => this._getHash(v));
+
+    const defineKeys = Object.keys(props.defines).sort();
+    const injectKeys = Object.keys(props.inject).sort();
+    const defineHashes = [];
+    const injectHashes = [];
+
+    for (const key of defineKeys) {
+      defineHashes.push(this._getHash(key));
+      defineHashes.push(this._getHash(props.defines[key]));
+    }
+
+    for (const key of injectKeys) {
+      injectHashes.push(this._getHash(key));
+      injectHashes.push(this._getHash(props.inject[key]));
+    }
+
+    // TODO - hash parameters!
+    const parameterHash = JSON.stringify(props.parameters);
+
+    return `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(
+      '/'
+    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${props.bufferMode}${
+      props.transpileToGLSL100 ? 'T' : ''
+    }P${parameterHash}`;
+  }
+
+  _getHash(key: string): number {
+    if (this._hashes[key] === undefined) {
+      this._hashes[key] = this._hashCounter++;
+    }
+    return this._hashes[key];
+  }
+
+  // Dedupe and combine with default modules
+  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {
+    const modules = new Array(this._defaultModules.length + appModules.length);
+    const seen: Record<string, boolean> = {};
+    let count = 0;
+
+    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {
+      const module = this._defaultModules[i];
+      const name = module.name;
+      modules[count++] = module;
+      seen[name] = true;
+    }
+
+    for (let i = 0, len = appModules.length; i < len; ++i) {
+      const module = appModules[i];
+      const name = module.name;
+      if (!seen[name]) {
+        modules[count++] = module;
+        seen[name] = true;
+      }
+    }
+
+    modules.length = count;
+
+    return modules;
+  }
+}

package/src/lib/render-loop.ts

@@ -1,32 +1,29 @@
-import {Stats} from '@probe.gl/stats';
-import type {AnimationProps} from './animation-loop';
+import type {DeviceProps} from '@luma.gl/api';
+import type {AnimationProps} from '../lib/animation-props';
 import AnimationLoop from './animation-loop';
-import {Timeline} from '../animation/timeline'
 
 /**
  * Minimal animation loop that initializes models in constructor
  * Simplifying type management
+ * v9 API
  */
 export abstract class RenderLoop {
   constructor(animationProps?: AnimationProps) {}
-  onRender(animationProps: AnimationProps) {}
-  onFinalize(animationProps: AnimationProps) {}
-
-  static getAnimationLoop(RenderLoopConstructor: typeof RenderLoop) {
-    return new WrappedAnimationLoop(RenderLoopConstructor);
-  }
 
   /** Instantiates and runs the render loop */
-  static run(RenderLoopConstructor: typeof RenderLoop, options?: {start?: boolean}): WrappedAnimationLoop {
-    const animationLoop = RenderLoop.getAnimationLoop(RenderLoopConstructor);
-    if (options?.start !== false) {
-      animationLoop.start();
-    }
+  static run(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps): AnimationLoop {
+    // Create an animation loop;
+    const animationLoop = new SyncInitAnimationLoop(RenderLoopConstructor, deviceProps);
+
+    // Start the loop automatically
+    // animationLoop.start();
+
     return animationLoop;
   }
 }
 
-class WrappedAnimationLoop extends AnimationLoop {
+/** Instantiates the RenderLoop once the device is created */
+class SyncInitAnimationLoop extends AnimationLoop {
   RenderLoopConstructor: typeof RenderLoop;
   renderLoop: RenderLoop;
 
@@ -35,8 +32,8 @@ class WrappedAnimationLoop extends AnimationLoop {
     return this.RenderLoopConstructor.info;
   }
 
-  constructor(RenderLoopConstructor: typeof RenderLoop) {
-    super();
+  constructor(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps) {
+    super({deviceProps});
     this.RenderLoopConstructor = RenderLoopConstructor;
   }
 
@@ -46,11 +43,16 @@ class WrappedAnimationLoop extends AnimationLoop {
   }
 
   onRender(animationProps: AnimationProps) {
-    this.renderLoop.onRender(animationProps);
+    // @ts-expect-error API still TBD
+    this.renderLoop?.onRender?.(animationProps);
+    // @ts-expect-error API still TBD
+    this.renderLoop?.frame?.(animationProps);
   }
 
   onFinalize(animationProps: AnimationProps) {
+    // @ts-expect-error API still TBD
     this.renderLoop?.onFinalize?.(animationProps);
+    // @ts-expect-error API still TBD
+    this.renderLoop?.destroy?.(animationProps);
   }
 }
-

package/dist/lib/program-manager.d.ts

@@ -1,39 +0,0 @@
-import { Device } from '@luma.gl/api/';
-import { Program } from '@luma.gl/webgl';
-declare type Module = 'string' | {
-    name: string;
-};
-declare type GetProgramOptions = {
-    vs?: string;
-    fs?: string;
-    defines?: {};
-    inject?: {};
-    varyings?: string[];
-    bufferMode?: number;
-    modules?: Module[];
-    transpileToGLSL100?: boolean;
-};
-export default class ProgramManager {
-    readonly device: Device;
-    stateHash: number;
-    private _hashCounter;
-    private readonly _hashes;
-    private readonly _useCounts;
-    private readonly _programCache;
-    private readonly _getUniforms;
-    private readonly _registeredModules;
-    private readonly _hookFunctions;
-    private _defaultModules;
-    static getDefaultProgramManager(device: Device): ProgramManager;
-    constructor(device: Device);
-    addDefaultModule(module: Module): void;
-    removeDefaultModule(module: Module): void;
-    addShaderHook(hook: any, opts?: any): void;
-    get(props?: GetProgramOptions): Program;
-    getUniforms(program: Program): any;
-    release(program: Program): void;
-    _getHash(key: string): string;
-    _getModuleList(appModules?: Module[]): Module[];
-}
-export {};
-//# sourceMappingURL=program-manager.d.ts.map

package/dist/lib/program-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"program-manager.d.ts","sourceRoot":"","sources":["../../src/lib/program-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAErC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAEvC,aAAK,MAAM,GAAG,QAAQ,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC;AAExC,aAAK,iBAAiB,GAAG;IACvB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,MAAM,CAAC,EAAE,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,SAAS,SAAK;IACd,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;IAEjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAM;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAM;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAM;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IACrC,OAAO,CAAC,eAAe,CAAM;IAE7B,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;gBAOnD,MAAM,EAAE,MAAM;IAI1B,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAStC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzC,aAAa,CAAC,IAAI,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,IAAI;IAShC,GAAG,CAAC,KAAK,GAAE,iBAAsB,GAAG,OAAO;IAqE3C,WAAW,CAAC,OAAO,EAAE,OAAO;IAI5B,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAY/B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAS7B,cAAc,CAAC,UAAU,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE;CA0BpD"}

package/dist/lib/program-manager.js

@@ -1,175 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { assembleShaders } from '@luma.gl/shadertools';
-import { Program } from '@luma.gl/webgl';
-export default class ProgramManager {
-  static getDefaultProgramManager(device) {
-    device.defaultProgramManager = device.defaultProgramManager || new ProgramManager(device);
-    return device.defaultProgramManager;
-  }
-
-  constructor(device) {
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "stateHash", 0);
-
-    _defineProperty(this, "_hashCounter", 0);
-
-    _defineProperty(this, "_hashes", {});
-
-    _defineProperty(this, "_useCounts", {});
-
-    _defineProperty(this, "_programCache", {});
-
-    _defineProperty(this, "_getUniforms", {});
-
-    _defineProperty(this, "_registeredModules", {});
-
-    _defineProperty(this, "_hookFunctions", []);
-
-    _defineProperty(this, "_defaultModules", []);
-
-    this.device = device;
-  }
-
-  addDefaultModule(module) {
-    if (!this._defaultModules.find(m => m.name === module.name)) {
-      this._defaultModules.push(module);
-    }
-
-    this.stateHash++;
-  }
-
-  removeDefaultModule(module) {
-    const moduleName = typeof module === 'string' ? module : module.name;
-    this._defaultModules = this._defaultModules.filter(m => m.name !== moduleName);
-    this.stateHash++;
-  }
-
-  addShaderHook(hook, opts) {
-    if (opts) {
-      hook = Object.assign(opts, {
-        hook
-      });
-    }
-
-    this._hookFunctions.push(hook);
-
-    this.stateHash++;
-  }
-
-  get(props = {}) {
-    const {
-      vs = '',
-      fs = '',
-      defines = {},
-      inject = {},
-      varyings = [],
-      bufferMode = 0x8c8d,
-      transpileToGLSL100 = false
-    } = props;
-
-    const modules = this._getModuleList(props.modules);
-
-    const vsHash = this._getHash(vs);
-
-    const fsHash = this._getHash(fs);
-
-    const moduleHashes = modules.map(m => this._getHash(m.name)).sort();
-    const varyingHashes = varyings.map(v => this._getHash(v));
-    const defineKeys = Object.keys(defines).sort();
-    const injectKeys = Object.keys(inject).sort();
-    const defineHashes = [];
-    const injectHashes = [];
-
-    for (const key of defineKeys) {
-      defineHashes.push(this._getHash(key));
-      defineHashes.push(this._getHash(defines[key]));
-    }
-
-    for (const key of injectKeys) {
-      injectHashes.push(this._getHash(key));
-      injectHashes.push(this._getHash(inject[key]));
-    }
-
-    const hash = "".concat(vsHash, "/").concat(fsHash, "D").concat(defineHashes.join('/'), "M").concat(moduleHashes.join('/'), "I").concat(injectHashes.join('/'), "V").concat(varyingHashes.join('/'), "H").concat(this.stateHash, "B").concat(bufferMode).concat(transpileToGLSL100 ? 'T' : '');
-
-    if (!this._programCache[hash]) {
-      const assembled = assembleShaders(this.device, {
-        vs,
-        fs,
-        modules,
-        inject,
-        defines,
-        hookFunctions: this._hookFunctions,
-        transpileToGLSL100
-      });
-      this._programCache[hash] = new Program(this.device.gl, {
-        hash,
-        vs: assembled.vs,
-        fs: assembled.fs,
-        varyings,
-        bufferMode
-      });
-
-      this._getUniforms[hash] = assembled.getUniforms || (x => {});
-
-      this._useCounts[hash] = 0;
-    }
-
-    this._useCounts[hash]++;
-    return this._programCache[hash];
-  }
-
-  getUniforms(program) {
-    return this._getUniforms[program.hash] || null;
-  }
-
-  release(program) {
-    const hash = program.hash;
-    this._useCounts[hash]--;
-
-    if (this._useCounts[hash] === 0) {
-      this._programCache[hash].delete();
-
-      delete this._programCache[hash];
-      delete this._getUniforms[hash];
-      delete this._useCounts[hash];
-    }
-  }
-
-  _getHash(key) {
-    if (this._hashes[key] === undefined) {
-      this._hashes[key] = this._hashCounter++;
-    }
-
-    return this._hashes[key];
-  }
-
-  _getModuleList(appModules = []) {
-    const modules = new Array(this._defaultModules.length + appModules.length);
-    const seen = {};
-    let count = 0;
-
-    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {
-      const module = this._defaultModules[i];
-      const name = module.name;
-      modules[count++] = module;
-      seen[name] = true;
-    }
-
-    for (let i = 0, len = appModules.length; i < len; ++i) {
-      const module = appModules[i];
-      const name = module.name;
-
-      if (!seen[name]) {
-        modules[count++] = module;
-        seen[name] = true;
-      }
-    }
-
-    modules.length = count;
-    return modules;
-  }
-
-}
-//# sourceMappingURL=program-manager.js.map

package/dist/lib/program-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/lib/program-manager.ts"],"names":["assembleShaders","Program","ProgramManager","getDefaultProgramManager","device","defaultProgramManager","constructor","addDefaultModule","module","_defaultModules","find","m","name","push","stateHash","removeDefaultModule","moduleName","filter","addShaderHook","hook","opts","Object","assign","_hookFunctions","get","props","vs","fs","defines","inject","varyings","bufferMode","transpileToGLSL100","modules","_getModuleList","vsHash","_getHash","fsHash","moduleHashes","map","sort","varyingHashes","v","defineKeys","keys","injectKeys","defineHashes","injectHashes","key","hash","join","_programCache","assembled","hookFunctions","gl","_getUniforms","getUniforms","x","_useCounts","program","release","delete","_hashes","undefined","_hashCounter","appModules","Array","length","seen","count","i","len"],"mappings":"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","sourcesContent":["import {Device} from '@luma.gl/api/';\nimport {assembleShaders} from '@luma.gl/shadertools';\nimport {Program} from '@luma.gl/webgl';\n\ntype Module = 'string' | {name: string}; // TODO\n\ntype GetProgramOptions = {\n  vs?: string,\n  fs?: string,\n  defines?: {},\n  inject?: {},\n  varyings?: string[],\n  bufferMode?: number,\n  modules?: Module[];\n  transpileToGLSL100?: boolean\n};\n\nexport default class ProgramManager {\n  readonly device: Device;\n\n  stateHash = 0; // Used change hashing if hooks are modified\n  private _hashCounter = 0;\n  private readonly _hashes = {};\n  private readonly _useCounts = {};\n\n  private readonly _programCache = {};\n  private readonly _getUniforms = {};\n  private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl\n  private readonly _hookFunctions = [];\n  private _defaultModules = [];\n\n  static getDefaultProgramManager(device: Device): ProgramManager {\n    // @ts-expect-error\n    device.defaultProgramManager = device.defaultProgramManager || new ProgramManager(device);\n    // @ts-expect-error\n    return device.defaultProgramManager;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  addDefaultModule(module: Module): void {\n    // @ts-expect-error\n    if (!this._defaultModules.find((m) => m.name === module.name)) {\n      this._defaultModules.push(module);\n    }\n\n    this.stateHash++;\n  }\n\n  removeDefaultModule(module: Module): void {\n    const moduleName = typeof module === 'string' ? module : module.name;\n    this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);\n    this.stateHash++;\n  }\n\n  addShaderHook(hook, opts?): void {\n    if (opts) {\n      hook = Object.assign(opts, {hook});\n    }\n\n    this._hookFunctions.push(hook);\n    this.stateHash++;\n  }\n\n  get(props: GetProgramOptions = {}): Program {\n    const {\n      vs = '',\n      fs = '',\n      defines = {},\n      inject = {},\n      varyings = [],\n      bufferMode = 0x8c8d,\n      transpileToGLSL100 = false\n    } = props; // varyings/bufferMode for xform feedback, 0x8c8d = SEPARATE_ATTRIBS\n\n    const modules = this._getModuleList(props.modules); // Combine with default modules\n\n    const vsHash = this._getHash(vs);\n    const fsHash = this._getHash(fs);\n    // @ts-expect-error\n    const moduleHashes = modules.map((m) => this._getHash(m.name)).sort();\n    const varyingHashes = varyings.map((v) => this._getHash(v));\n\n    const defineKeys = Object.keys(defines).sort();\n    const injectKeys = Object.keys(inject).sort();\n    const defineHashes = [];\n    const injectHashes = [];\n\n    for (const key of defineKeys) {\n      defineHashes.push(this._getHash(key));\n      defineHashes.push(this._getHash(defines[key]));\n    }\n\n    for (const key of injectKeys) {\n      injectHashes.push(this._getHash(key));\n      injectHashes.push(this._getHash(inject[key]));\n    }\n\n    const hash = `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(\n      '/'\n    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${bufferMode}${\n      transpileToGLSL100 ? 'T' : ''\n    }`;\n\n    if (!this._programCache[hash]) {\n      const assembled = assembleShaders(this.device, {\n        vs,\n        fs,\n        modules,\n        inject,\n        defines,\n        hookFunctions: this._hookFunctions,\n        transpileToGLSL100\n      });\n\n      // @ts-expect-error TODO - program should be created from device\n      this._programCache[hash] = new Program(this.device.gl, {\n        hash,\n        vs: assembled.vs,\n        fs: assembled.fs,\n        varyings,\n        bufferMode\n      });\n\n      this._getUniforms[hash] = assembled.getUniforms || ((x) => {});\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return this._programCache[hash];\n  }\n\n  getUniforms(program: Program) {\n    return this._getUniforms[program.hash] || null;\n  }\n\n  release(program: Program): void {\n    const hash = program.hash;\n    this._useCounts[hash]--;\n\n    if (this._useCounts[hash] === 0) {\n      this._programCache[hash].delete();\n      delete this._programCache[hash];\n      delete this._getUniforms[hash];\n      delete this._useCounts[hash];\n    }\n  }\n\n  _getHash(key: string): string {\n    if (this._hashes[key] === undefined) {\n      this._hashes[key] = this._hashCounter++;\n    }\n\n    return this._hashes[key];\n  }\n\n  // Dedup and combine with default modules\n  _getModuleList(appModules: Module[] = []): Module[] {\n    const modules = new Array(this._defaultModules.length + appModules.length);\n    const seen = {};\n    let count = 0;\n\n    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {\n      const module = this._defaultModules[i];\n      const name = module.name;\n      modules[count++] = module;\n      seen[name] = true;\n    }\n\n    for (let i = 0, len = appModules.length; i < len; ++i) {\n      const module = appModules[i];\n      // @ts-expect-error\n      const name = module.name;\n      if (!seen[name]) {\n        modules[count++] = module;\n        seen[name] = true;\n      }\n    }\n\n    modules.length = count;\n\n    return modules;\n  }\n}\n"],"file":"program-manager.js"}

package/dist/transform/buffer-transform.d.ts

@@ -1,36 +0,0 @@
-import { Buffer } from '@luma.gl/webgl';
-import type { TransformProps, TransformDrawOptions, TransformRunOptions, TransformBinding } from './transform-types';
-export default class BufferTransform {
-    gl: WebGL2RenderingContext;
-    currentIndex: number;
-    feedbackMap: {};
-    varyings: string[] | null;
-    bindings: TransformBinding[];
-    resources: {};
-    constructor(gl: WebGL2RenderingContext, props?: TransformProps);
-    setupResources(opts: any): void;
-    updateModelProps(props?: TransformProps): TransformProps;
-    getDrawOptions(opts?: TransformRunOptions): TransformDrawOptions;
-    swap(): boolean;
-    update(opts?: {}): void;
-    getBuffer(varyingName: string | null): Buffer | null;
-    getData(options?: {
-        varyingName?: string;
-    }): any;
-    delete(): void;
-    _initialize(props?: TransformProps): void;
-    _getFeedbackBuffers(props: any): {};
-    _setupBuffers(props?: {}): void;
-    _setupTransformFeedback(binding: any, { model }: {
-        model: any;
-    }): void;
-    _updateBindings(opts: any): void;
-    _updateBinding(binding: any, opts: any): any;
-    _swapBuffers(opts: any): {
-        sourceBuffers: any;
-        feedbackBuffers: any;
-    };
-    _createNewBuffer(name: any, opts: any): Buffer;
-    _getNextIndex(): number;
-}
-//# sourceMappingURL=buffer-transform.d.ts.map

package/dist/transform/buffer-transform.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"buffer-transform.d.ts","sourceRoot":"","sources":["../../src/transform/buffer-transform.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAA8B,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAcnH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,EAAE,EAAE,sBAAsB,CAAC;IAC3B,YAAY,SAAK;IACjB,WAAW,KAAM;IACjB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IACjC,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAClC,SAAS,KAAM;gBAEH,EAAE,EAAE,sBAAsB,EAAE,KAAK,GAAE,cAAmB;IAMlE,cAAc,CAAC,IAAI,KAAA,GAAG,IAAI;IAM1B,gBAAgB,CAAC,KAAK,GAAE,cAAmB,GAAG,cAAc;IAS5D,cAAc,CAAC,IAAI,GAAE,mBAAwB,GAAG,oBAAoB;IAQpE,IAAI,IAAI,OAAO;IASf,MAAM,CAAC,IAAI,KAAK;IAKhB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI;IASpD,OAAO,CAAC,OAAO,GAAE;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAM;IAU5C,MAAM,IAAI,IAAI;IAQd,WAAW,CAAC,KAAK,GAAE,cAAmB,GAAG,IAAI;IAU7C,mBAAmB,CAAC,KAAK,KAAA;IAmCzB,aAAa,CAAC,KAAK,KAAK;IASxB,uBAAuB,CAAC,OAAO,KAAA,EAAE,EAAC,KAAK,EAAC;;KAAA,GAAG,IAAI;IAQ/C,eAAe,CAAC,IAAI,KAAA,GAAG,IAAI;IAY3B,cAAc,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA;IAe5B,YAAY,CAAC,IAAI,KAAA,GAAG;QAAC,aAAa,EAAE,GAAG,CAAC;QAAC,eAAe,EAAE,GAAG,CAAA;KAAC;IAkB9D,gBAAgB,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA,GAAG,MAAM;IASpC,aAAa,IAAI,MAAM;CAGxB"}