@luma.gl/engine 9.3.0-alpha.6 → 9.3.0-alpha.8

package/src/shader-inputs.ts

@@ -2,16 +2,25 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Binding, UniformValue} from '@luma.gl/core';
+import type {Binding, CompositeShaderType} from '@luma.gl/core';
 import {log} from '@luma.gl/core';
 // import type {VariableShaderType, UniformValue, UniformFormat, UniformInfoDevice, Texture, Sampler} from '@luma.gl/core';
-import {getShaderModuleDependencies, ShaderModule} from '@luma.gl/shadertools';
+import {
+  getShaderModuleDependencies,
+  ShaderModule,
+  ShaderModuleUniformValue
+} from '@luma.gl/shadertools';
 import {splitUniformsAndBindings} from './model/split-uniforms-and-bindings';
 
 export type ShaderInputsOptions = {
   disableWarnings?: boolean;
 };
 
+type ShaderInputsModule = Pick<
+  ShaderModule<any, any, any>,
+  'bindingLayout' | 'defaultUniforms' | 'dependencies' | 'getUniforms' | 'name' | 'uniformTypes'
+>;
+
 /**
  * ShaderInputs holds uniform and binding values for one or more shader modules,
  * - It can generate binary data for any uniform buffer
@@ -33,10 +42,10 @@ export class ShaderInputs<
    * @todo should should this include the resolved dependencies?
    */
   // @ts-ignore Fix typings
-  modules: Readonly<{[P in keyof ShaderPropsT]: ShaderModule<ShaderPropsT[P]>}>;
+  modules: Readonly<{[P in keyof ShaderPropsT]: ShaderInputsModule}>;
 
   /** Stores the uniform values for each module */
-  moduleUniforms: Record<keyof ShaderPropsT, Record<string, UniformValue>>;
+  moduleUniforms: Record<keyof ShaderPropsT, Record<string, ShaderModuleUniformValue>>;
   /** Stores the uniform bindings for each module  */
   moduleBindings: Record<keyof ShaderPropsT, Record<string, Binding>>;
   /** Tracks if uniforms have changed */
@@ -48,14 +57,14 @@ export class ShaderInputs<
    */
   constructor(
     // @ts-ignore Fix typings
-    modules: {[P in keyof ShaderPropsT]?: ShaderModule<ShaderPropsT[P], any>},
+    modules: {[P in keyof ShaderPropsT]?: ShaderInputsModule},
     options?: ShaderInputsOptions
   ) {
     Object.assign(this.options, options);
 
     // Extract modules with dependencies
     const resolvedModules = getShaderModuleDependencies(
-      Object.values(modules).filter(module => module.dependencies)
+      Object.values(modules).filter(isShaderInputsModuleWithDependencies)
     );
     for (const resolvedModule of resolvedModules) {
       // @ts-ignore
@@ -66,12 +75,19 @@ export class ShaderInputs<
 
     // Store the module definitions and create storage for uniform values and binding values, per module
     // @ts-ignore Fix typings
-    this.modules = modules as {[P in keyof ShaderPropsT]: ShaderModule<ShaderPropsT[P]>};
-    this.moduleUniforms = {} as Record<keyof ShaderPropsT, Record<string, UniformValue>>;
+    this.modules = modules as {[P in keyof ShaderPropsT]: ShaderInputsModule};
+    this.moduleUniforms = {} as Record<
+      keyof ShaderPropsT,
+      Record<string, ShaderModuleUniformValue>
+    >;
     this.moduleBindings = {} as Record<keyof ShaderPropsT, Record<string, Binding>>;
 
     // Initialize the modules
     for (const [name, module] of Object.entries(modules)) {
+      if (!module) {
+        continue;
+      }
+
       this._addModule(module);
       if (module.name && name !== module.name && !this.options.disableWarnings) {
         log.warn(`Module name: ${name} vs ${module.name}`)();
@@ -98,13 +114,20 @@ export class ShaderInputs<
         continue; // eslint-disable-line no-continue
       }
 
-      const oldUniforms = this.moduleUniforms[moduleName] as (typeof module)['uniforms'];
+      const oldUniforms = this.moduleUniforms[moduleName];
       const oldBindings = this.moduleBindings[moduleName];
       const uniformsAndBindings =
         module.getUniforms?.(moduleProps, oldUniforms) || (moduleProps as any);
 
-      const {uniforms, bindings} = splitUniformsAndBindings(uniformsAndBindings);
-      this.moduleUniforms[moduleName] = {...oldUniforms, ...uniforms};
+      const {uniforms, bindings} = splitUniformsAndBindings(
+        uniformsAndBindings,
+        module.uniformTypes as Readonly<Record<string, CompositeShaderType>>
+      );
+      this.moduleUniforms[moduleName] = mergeModuleUniforms(
+        oldUniforms as Record<string, ShaderModuleUniformValue>,
+        uniforms,
+        module.uniformTypes as Readonly<Record<string, CompositeShaderType>>
+      );
       this.moduleBindings[moduleName] = {...oldBindings, ...bindings};
       // this.moduleUniformsChanged ||= moduleName;
 
@@ -117,11 +140,13 @@ export class ShaderInputs<
    * @todo should should this include the resolved dependencies?
    */
   getModules(): ShaderModule[] {
-    return Object.values(this.modules);
+    return Object.values(this.modules) as ShaderModule[];
   }
 
   /** Get all uniform values for all modules */
-  getUniformValues(): Partial<Record<keyof ShaderPropsT, Record<string, UniformValue>>> {
+  getUniformValues(): Partial<
+    Record<keyof ShaderPropsT, Record<string, ShaderModuleUniformValue>>
+  > {
     return this.moduleUniforms;
   }
 
@@ -150,10 +175,135 @@ export class ShaderInputs<
     return table;
   }
 
-  _addModule(module: ShaderModule): void {
+  _addModule(module: ShaderInputsModule): void {
     const moduleName = module.name as keyof ShaderPropsT;
     // Get default uniforms from module
-    this.moduleUniforms[moduleName] = module.defaultUniforms || {};
+    this.moduleUniforms[moduleName] = mergeModuleUniforms(
+      {},
+      (module.defaultUniforms || {}) as Record<string, ShaderModuleUniformValue>,
+      module.uniformTypes as Readonly<Record<string, CompositeShaderType>>
+    );
     this.moduleBindings[moduleName] = {};
   }
 }
+
+function mergeModuleUniforms(
+  currentUniforms: Record<string, ShaderModuleUniformValue> = {},
+  nextUniforms: Record<string, ShaderModuleUniformValue> = {},
+  uniformTypes: Readonly<Record<string, CompositeShaderType>> = {}
+): Record<string, ShaderModuleUniformValue> {
+  const mergedUniforms = {...currentUniforms};
+  for (const [key, value] of Object.entries(nextUniforms)) {
+    if (value === undefined) {
+      continue;
+    }
+
+    mergedUniforms[key] = mergeModuleUniformValue(currentUniforms[key], value, uniformTypes[key]);
+  }
+  return mergedUniforms;
+}
+
+function mergeModuleUniformValue(
+  currentValue: ShaderModuleUniformValue | undefined,
+  nextValue: ShaderModuleUniformValue,
+  uniformType: CompositeShaderType | undefined
+): ShaderModuleUniformValue {
+  if (!uniformType || typeof uniformType === 'string') {
+    return cloneModuleUniformValue(nextValue);
+  }
+
+  if (Array.isArray(uniformType)) {
+    if (isPackedUniformArrayValue(nextValue) || !Array.isArray(nextValue)) {
+      return cloneModuleUniformValue(nextValue);
+    }
+
+    const currentArray: Array<ShaderModuleUniformValue | undefined> =
+      Array.isArray(currentValue) && !isPackedUniformArrayValue(currentValue)
+        ? [...currentValue]
+        : [];
+    const mergedArray = currentArray.slice();
+    for (let index = 0; index < nextValue.length; index++) {
+      const elementValue = nextValue[index];
+      if (elementValue === undefined) {
+        continue;
+      }
+
+      mergedArray[index] = mergeModuleUniformValue(
+        currentArray[index],
+        elementValue,
+        uniformType[0] as CompositeShaderType
+      );
+    }
+    return mergedArray;
+  }
+
+  if (!isPlainUniformObject(nextValue)) {
+    return cloneModuleUniformValue(nextValue);
+  }
+
+  const uniformStruct = uniformType as Record<string, CompositeShaderType>;
+  const currentObject = isPlainUniformObject(currentValue) ? currentValue : {};
+  const mergedObject: Record<string, ShaderModuleUniformValue | undefined> = {...currentObject};
+  for (const [key, value] of Object.entries(nextValue)) {
+    if (value === undefined) {
+      continue;
+    }
+
+    mergedObject[key] = mergeModuleUniformValue(currentObject[key], value, uniformStruct[key]);
+  }
+  return mergedObject as ShaderModuleUniformValue;
+}
+
+function cloneModuleUniformValue(value: ShaderModuleUniformValue): ShaderModuleUniformValue {
+  if (ArrayBuffer.isView(value)) {
+    return Array.prototype.slice.call(value) as ShaderModuleUniformValue;
+  }
+
+  if (Array.isArray(value)) {
+    if (isPackedUniformArrayValue(value)) {
+      return value.slice() as ShaderModuleUniformValue;
+    }
+
+    const compositeArray = value as ReadonlyArray<ShaderModuleUniformValue | undefined>;
+    return compositeArray.map(element =>
+      element === undefined ? undefined : cloneModuleUniformValue(element)
+    ) as ShaderModuleUniformValue;
+  }
+
+  if (isPlainUniformObject(value)) {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, nestedValue]) => [
+        key,
+        nestedValue === undefined ? undefined : cloneModuleUniformValue(nestedValue)
+      ])
+    ) as ShaderModuleUniformValue;
+  }
+
+  return value;
+}
+
+function isPackedUniformArrayValue(
+  value: unknown
+): value is ReadonlyArray<number> | ArrayBufferView {
+  return (
+    ArrayBuffer.isView(value) ||
+    (Array.isArray(value) && (value.length === 0 || typeof value[0] === 'number'))
+  );
+}
+
+function isPlainUniformObject(
+  value: unknown
+): value is Record<string, ShaderModuleUniformValue | undefined> {
+  return (
+    Boolean(value) &&
+    typeof value === 'object' &&
+    !Array.isArray(value) &&
+    !ArrayBuffer.isView(value)
+  );
+}
+
+function isShaderInputsModuleWithDependencies(
+  module: ShaderInputsModule | undefined
+): module is ShaderInputsModule & {dependencies: NonNullable<ShaderInputsModule['dependencies']>} {
+  return Boolean(module?.dependencies);
+}

package/src/utils/shader-module-utils.ts

@@ -0,0 +1,65 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {ComputeShaderLayout, ShaderLayout} from '@luma.gl/core';
+import type {ShaderModule} from '@luma.gl/shadertools';
+
+type AnyShaderLayout = ShaderLayout | ComputeShaderLayout;
+
+export function mergeShaderModuleBindingsIntoLayout<TShaderLayout extends AnyShaderLayout>(
+  shaderLayout: TShaderLayout | null | undefined,
+  modules: ShaderModule[]
+): TShaderLayout | null | undefined {
+  if (!shaderLayout || !modules.some(module => module.bindingLayout?.length)) {
+    return shaderLayout;
+  }
+
+  const mergedLayout = {
+    ...shaderLayout,
+    bindings: shaderLayout.bindings.map(binding => ({...binding}))
+  } as TShaderLayout;
+
+  if ('attributes' in (shaderLayout || {})) {
+    (mergedLayout as ShaderLayout).attributes = (shaderLayout as ShaderLayout)?.attributes || [];
+  }
+
+  for (const module of modules) {
+    for (const bindingLayout of module.bindingLayout || []) {
+      for (const relatedBindingName of getRelatedBindingNames(bindingLayout.name)) {
+        const binding = mergedLayout.bindings.find(
+          candidate => candidate.name === relatedBindingName
+        );
+        if (binding?.group === 0) {
+          binding.group = bindingLayout.group;
+        }
+      }
+    }
+  }
+
+  return mergedLayout;
+}
+
+export function shaderModuleHasUniforms(module: ShaderModule): boolean {
+  return Boolean(module.uniformTypes && !isObjectEmpty(module.uniformTypes));
+}
+
+/** Returns binding-name aliases that should share the module-declared bind group. */
+function getRelatedBindingNames(bindingName: string): string[] {
+  const bindingNames = new Set<string>([bindingName, `${bindingName}Uniforms`]);
+
+  if (!bindingName.endsWith('Uniforms')) {
+    bindingNames.add(`${bindingName}Sampler`);
+  }
+
+  return [...bindingNames];
+}
+
+function isObjectEmpty(obj: object): boolean {
+  // @ts-ignore key is intentionally unused
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  for (const key in obj) {
+    return false;
+  }
+  return true;
+}

package/dist/factories/pipeline-factory.d.ts

@@ -1,39 +0,0 @@
-import type { RenderPipelineProps, ComputePipelineProps, SharedRenderPipeline } from '@luma.gl/core';
-import { Device, RenderPipeline, ComputePipeline } from '@luma.gl/core';
-export type PipelineFactoryProps = RenderPipelineProps;
-/**
- * Efficiently creates / caches pipelines
- */
-export declare class PipelineFactory {
-    static defaultProps: Required<PipelineFactoryProps>;
-    /** Get the singleton default pipeline factory for the specified device */
-    static getDefaultPipelineFactory(device: Device): PipelineFactory;
-    readonly device: Device;
-    private _hashCounter;
-    private readonly _hashes;
-    private readonly _renderPipelineCache;
-    private readonly _computePipelineCache;
-    private readonly _sharedRenderPipelineCache;
-    get [Symbol.toStringTag](): string;
-    toString(): string;
-    constructor(device: Device);
-    /** Return a RenderPipeline matching supplied props. Reuses an equivalent pipeline if already created. */
-    createRenderPipeline(props: RenderPipelineProps): RenderPipeline;
-    /** Return a ComputePipeline matching supplied props. Reuses an equivalent pipeline if already created. */
-    createComputePipeline(props: ComputePipelineProps): ComputePipeline;
-    release(pipeline: RenderPipeline | ComputePipeline): void;
-    createSharedRenderPipeline(props: RenderPipelineProps): SharedRenderPipeline;
-    releaseSharedRenderPipeline(pipeline: RenderPipeline): void;
-    /** Destroy a cached pipeline, removing it from the cache if configured to do so. */
-    private _destroyPipeline;
-    /** Get the appropriate cache for the type of pipeline */
-    private _getCache;
-    /** Calculate a hash based on all the inputs for a compute pipeline */
-    private _hashComputePipeline;
-    /** Calculate a hash based on all the inputs for a render pipeline */
-    private _hashRenderPipeline;
-    private _hashSharedRenderPipeline;
-    private _getHash;
-    private _getWebGLVaryingHash;
-}
-//# sourceMappingURL=pipeline-factory.d.ts.map

package/dist/factories/pipeline-factory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/factories/pipeline-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAgB,MAAM,eAAe,CAAC;AAIrF,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAIvD;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAoC;IAEvF,0EAA0E;IAC1E,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;IAMjE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAiD;IACtF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAkD;IACxF,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAuD;IAElG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,QAAQ,IAAI,MAAM;gBAIN,MAAM,EAAE,MAAM;IAI1B,yGAAyG;IACzG,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,GAAG,cAAc;IAuChE,0GAA0G;IAC1G,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,eAAe;IAkCnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI;IAuBzD,0BAA0B,CAAC,KAAK,EAAE,mBAAmB,GAAG,oBAAoB;IAY5E,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAoB3D,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;IAexB,yDAAyD;IACzD,OAAO,CAAC,SAAS;IAsBjB,sEAAsE;IACtE,OAAO,CAAC,oBAAoB;IAM5B,qEAAqE;IACrE,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,yBAAyB;IAOjC,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,oBAAoB;CAI7B"}

package/dist/factories/pipeline-factory.js

@@ -1,216 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { RenderPipeline, ComputePipeline, log } from '@luma.gl/core';
-import { uid } from "../utils/uid.js";
-/**
- * Efficiently creates / caches pipelines
- */
-export class PipelineFactory {
-    static defaultProps = { ...RenderPipeline.defaultProps };
-    /** Get the singleton default pipeline factory for the specified device */
-    static getDefaultPipelineFactory(device) {
-        const moduleData = device.getModuleData('@luma.gl/engine');
-        moduleData.defaultPipelineFactory ||= new PipelineFactory(device);
-        return moduleData.defaultPipelineFactory;
-    }
-    device;
-    _hashCounter = 0;
-    _hashes = {};
-    _renderPipelineCache = {};
-    _computePipelineCache = {};
-    _sharedRenderPipelineCache = {};
-    get [Symbol.toStringTag]() {
-        return 'PipelineFactory';
-    }
-    toString() {
-        return `PipelineFactory(${this.device.id})`;
-    }
-    constructor(device) {
-        this.device = device;
-    }
-    /** Return a RenderPipeline matching supplied props. Reuses an equivalent pipeline if already created. */
-    createRenderPipeline(props) {
-        if (!this.device.props._cachePipelines) {
-            return this.device.createRenderPipeline(props);
-        }
-        const allProps = { ...RenderPipeline.defaultProps, ...props };
-        const cache = this._renderPipelineCache;
-        const hash = this._hashRenderPipeline(allProps);
-        let pipeline = cache[hash]?.resource;
-        if (!pipeline) {
-            const sharedRenderPipeline = this.device.type === 'webgl' && this.device.props._sharePipelines
-                ? this.createSharedRenderPipeline(allProps)
-                : undefined;
-            pipeline = this.device.createRenderPipeline({
-                ...allProps,
-                id: allProps.id ? `${allProps.id}-cached` : uid('unnamed-cached'),
-                _sharedRenderPipeline: sharedRenderPipeline
-            });
-            pipeline.hash = hash;
-            cache[hash] = { resource: pipeline, useCount: 1 };
-            if (this.device.props.debugFactories) {
-                log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
-            }
-        }
-        else {
-            cache[hash].useCount++;
-            if (this.device.props.debugFactories) {
-                log.log(3, `${this}: ${cache[hash].resource} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
-            }
-        }
-        return pipeline;
-    }
-    /** Return a ComputePipeline matching supplied props. Reuses an equivalent pipeline if already created. */
-    createComputePipeline(props) {
-        if (!this.device.props._cachePipelines) {
-            return this.device.createComputePipeline(props);
-        }
-        const allProps = { ...ComputePipeline.defaultProps, ...props };
-        const cache = this._computePipelineCache;
-        const hash = this._hashComputePipeline(allProps);
-        let pipeline = cache[hash]?.resource;
-        if (!pipeline) {
-            pipeline = this.device.createComputePipeline({
-                ...allProps,
-                id: allProps.id ? `${allProps.id}-cached` : undefined
-            });
-            pipeline.hash = hash;
-            cache[hash] = { resource: pipeline, useCount: 1 };
-            if (this.device.props.debugFactories) {
-                log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
-            }
-        }
-        else {
-            cache[hash].useCount++;
-            if (this.device.props.debugFactories) {
-                log.log(3, `${this}: ${cache[hash].resource} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
-            }
-        }
-        return pipeline;
-    }
-    release(pipeline) {
-        if (!this.device.props._cachePipelines) {
-            pipeline.destroy();
-            return;
-        }
-        const cache = this._getCache(pipeline);
-        const hash = pipeline.hash;
-        cache[hash].useCount--;
-        if (cache[hash].useCount === 0) {
-            this._destroyPipeline(pipeline);
-            if (this.device.props.debugFactories) {
-                log.log(3, `${this}: ${pipeline} released and destroyed`)();
-            }
-        }
-        else if (cache[hash].useCount < 0) {
-            log.error(`${this}: ${pipeline} released, useCount < 0, resetting`)();
-            cache[hash].useCount = 0;
-        }
-        else if (this.device.props.debugFactories) {
-            log.log(3, `${this}: ${pipeline} released, count=${cache[hash].useCount}`)();
-        }
-    }
-    createSharedRenderPipeline(props) {
-        const sharedPipelineHash = this._hashSharedRenderPipeline(props);
-        let sharedCacheItem = this._sharedRenderPipelineCache[sharedPipelineHash];
-        if (!sharedCacheItem) {
-            const sharedRenderPipeline = this.device._createSharedRenderPipelineWebGL(props);
-            sharedCacheItem = { resource: sharedRenderPipeline, useCount: 0 };
-            this._sharedRenderPipelineCache[sharedPipelineHash] = sharedCacheItem;
-        }
-        sharedCacheItem.useCount++;
-        return sharedCacheItem.resource;
-    }
-    releaseSharedRenderPipeline(pipeline) {
-        if (!pipeline.sharedRenderPipeline) {
-            return;
-        }
-        const sharedPipelineHash = this._hashSharedRenderPipeline(pipeline.sharedRenderPipeline.props);
-        const sharedCacheItem = this._sharedRenderPipelineCache[sharedPipelineHash];
-        if (!sharedCacheItem) {
-            return;
-        }
-        sharedCacheItem.useCount--;
-        if (sharedCacheItem.useCount === 0) {
-            sharedCacheItem.resource.destroy();
-            delete this._sharedRenderPipelineCache[sharedPipelineHash];
-        }
-    }
-    // PRIVATE
-    /** Destroy a cached pipeline, removing it from the cache if configured to do so. */
-    _destroyPipeline(pipeline) {
-        const cache = this._getCache(pipeline);
-        if (!this.device.props._destroyPipelines) {
-            return false;
-        }
-        delete cache[pipeline.hash];
-        pipeline.destroy();
-        if (pipeline instanceof RenderPipeline) {
-            this.releaseSharedRenderPipeline(pipeline);
-        }
-        return true;
-    }
-    /** Get the appropriate cache for the type of pipeline */
-    _getCache(pipeline) {
-        let cache;
-        if (pipeline instanceof ComputePipeline) {
-            cache = this._computePipelineCache;
-        }
-        if (pipeline instanceof RenderPipeline) {
-            cache = this._renderPipelineCache;
-        }
-        if (!cache) {
-            throw new Error(`${this}`);
-        }
-        if (!cache[pipeline.hash]) {
-            throw new Error(`${this}: ${pipeline} matched incorrect entry`);
-        }
-        return cache;
-    }
-    /** Calculate a hash based on all the inputs for a compute pipeline */
-    _hashComputePipeline(props) {
-        const { type } = this.device;
-        const shaderHash = this._getHash(props.shader.source);
-        return `${type}/C/${shaderHash}`;
-    }
-    /** Calculate a hash based on all the inputs for a render pipeline */
-    _hashRenderPipeline(props) {
-        const vsHash = props.vs ? this._getHash(props.vs.source) : 0;
-        const fsHash = props.fs ? this._getHash(props.fs.source) : 0;
-        const varyingHash = this._getWebGLVaryingHash(props);
-        const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
-        const { type } = this.device;
-        switch (type) {
-            case 'webgl':
-                // WebGL wrappers preserve default topology and parameter semantics for direct
-                // callers, even though the underlying linked program may be shared separately.
-                const webglParameterHash = this._getHash(JSON.stringify(props.parameters));
-                return `${type}/R/${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${webglParameterHash}BL${bufferLayoutHash}`;
-            case 'webgpu':
-            default:
-                // On WebGPU we need to rebuild the pipeline if topology, parameters or bufferLayout change
-                const parameterHash = this._getHash(JSON.stringify(props.parameters));
-                // TODO - Can json.stringify() generate different strings for equivalent objects if order of params is different?
-                // create a deepHash() to deduplicate?
-                return `${type}/R/${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}`;
-        }
-    }
-    _hashSharedRenderPipeline(props) {
-        const vsHash = props.vs ? this._getHash(props.vs.source) : 0;
-        const fsHash = props.fs ? this._getHash(props.fs.source) : 0;
-        const varyingHash = this._getWebGLVaryingHash(props);
-        return `webgl/S/${vsHash}/${fsHash}V${varyingHash}`;
-    }
-    _getHash(key) {
-        if (this._hashes[key] === undefined) {
-            this._hashes[key] = this._hashCounter++;
-        }
-        return this._hashes[key];
-    }
-    _getWebGLVaryingHash(props) {
-        const { varyings = [], bufferMode = null } = props;
-        return this._getHash(JSON.stringify({ varyings, bufferMode }));
-    }
-}
-//# sourceMappingURL=pipeline-factory.js.map

package/dist/factories/pipeline-factory.js.map

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

package/dist/factories/shader-factory.d.ts

@@ -1,19 +0,0 @@
-import { Device, Shader, ShaderProps } from '@luma.gl/core';
-/** Manages a cached pool of Shaders for reuse. */
-export declare class ShaderFactory {
-    static readonly defaultProps: Required<ShaderProps>;
-    /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
-    static getDefaultShaderFactory(device: Device): ShaderFactory;
-    readonly device: Device;
-    private readonly _cache;
-    get [Symbol.toStringTag](): string;
-    toString(): string;
-    /** @internal */
-    constructor(device: Device);
-    /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
-    createShader(props: ShaderProps): Shader;
-    /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
-    release(shader: Shader): void;
-    protected _hashShader(value: Shader | ShaderProps): string;
-}
-//# sourceMappingURL=shader-factory.d.ts.map

package/dist/factories/shader-factory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shader-factory.d.ts","sourceRoot":"","sources":["../../src/factories/shader-factory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAM,MAAM,eAAe,CAAC;AAK/D,kDAAkD;AAClD,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA4B;IAE/E,iGAAiG;IACjG,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAM7D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAExD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,QAAQ,IAAI,MAAM;IAIlB,gBAAgB;gBACJ,MAAM,EAAE,MAAM;IAI1B,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BxC,wFAAwF;IACxF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA4B7B,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM;CAG3D"}