@luma.gl/engine 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/index.d.ts

@@ -1,41 +1,44 @@
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
-export type { AnimationProps } from './animation-loop/animation-props';
-export { AnimationLoopTemplate } from './animation-loop/animation-loop-template';
-export type { AnimationLoopProps } from './animation-loop/animation-loop';
-export { AnimationLoop } from './animation-loop/animation-loop';
-export type { MakeAnimationLoopProps } from './animation-loop/make-animation-loop';
-export { makeAnimationLoop } from './animation-loop/make-animation-loop';
-export type { ModelProps } from './model/model';
-export { Model } from './model/model';
-export type { BufferTransformProps } from './transform/buffer-transform';
-export { BufferTransform } from './transform/buffer-transform';
-export type { TextureTransformProps } from './transform/texture-transform';
-export { TextureTransform } from './transform/texture-transform';
-export { PipelineFactory } from './lib/pipeline-factory';
-export { ClipSpace } from './lib/clip-space';
-export { ScenegraphNode } from './scenegraph/scenegraph-node';
-export { GroupNode } from './scenegraph/group-node';
-export type { ModelNodeProps } from './scenegraph/model-node';
-export { ModelNode } from './scenegraph/model-node';
-export type { GeometryProps } from './geometry/geometry';
-export { Geometry } from './geometry/geometry';
-export type { GPUGeometryProps } from './geometry/gpu-geometry';
-export { GPUGeometry } from './geometry/gpu-geometry';
-export type { ConeGeometryProps } from './geometries/cone-geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export type { CubeGeometryProps } from './geometries/cube-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export type { CylinderGeometryProps } from './geometries/cylinder-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export type { IcoSphereGeometryProps } from './geometries/ico-sphere-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export type { PlaneGeometryProps } from './geometries/plane-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export type { SphereGeometryProps } from './geometries/sphere-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export type { TruncatedConeGeometryProps } from './geometries/truncated-cone-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export type { ShaderModuleInputs } from './shader-inputs';
-export { ShaderInputs as _ShaderInputs } from './shader-inputs';
+export { Timeline } from "./animation/timeline.js";
+export { KeyFrames } from "./animation/key-frames.js";
+export type { AnimationProps } from "./animation-loop/animation-props.js";
+export { AnimationLoopTemplate } from "./animation-loop/animation-loop-template.js";
+export type { AnimationLoopProps } from "./animation-loop/animation-loop.js";
+export { AnimationLoop } from "./animation-loop/animation-loop.js";
+export type { MakeAnimationLoopProps } from "./animation-loop/make-animation-loop.js";
+export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
+export type { ModelProps } from "./model/model.js";
+export { Model } from "./model/model.js";
+export type { BufferTransformProps } from "./transform/buffer-transform.js";
+export { BufferTransform } from "./transform/buffer-transform.js";
+export type { TextureTransformProps } from "./transform/texture-transform.js";
+export { TextureTransform } from "./transform/texture-transform.js";
+export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ShaderFactory } from "./lib/shader-factory.js";
+export { ClipSpace } from "./lib/clip-space.js";
+export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
+export { GroupNode } from "./scenegraph/group-node.js";
+export type { ModelNodeProps } from "./scenegraph/model-node.js";
+export { ModelNode } from "./scenegraph/model-node.js";
+export type { GeometryProps } from "./geometry/geometry.js";
+export { Geometry } from "./geometry/geometry.js";
+export type { GPUGeometryProps } from "./geometry/gpu-geometry.js";
+export { GPUGeometry } from "./geometry/gpu-geometry.js";
+export type { ConeGeometryProps } from "./geometries/cone-geometry.js";
+export { ConeGeometry } from "./geometries/cone-geometry.js";
+export type { CubeGeometryProps } from "./geometries/cube-geometry.js";
+export { CubeGeometry } from "./geometries/cube-geometry.js";
+export type { CylinderGeometryProps } from "./geometries/cylinder-geometry.js";
+export { CylinderGeometry } from "./geometries/cylinder-geometry.js";
+export type { IcoSphereGeometryProps } from "./geometries/ico-sphere-geometry.js";
+export { IcoSphereGeometry } from "./geometries/ico-sphere-geometry.js";
+export type { PlaneGeometryProps } from "./geometries/plane-geometry.js";
+export { PlaneGeometry } from "./geometries/plane-geometry.js";
+export type { SphereGeometryProps } from "./geometries/sphere-geometry.js";
+export { SphereGeometry } from "./geometries/sphere-geometry.js";
+export type { TruncatedConeGeometryProps } from "./geometries/truncated-cone-geometry.js";
+export { TruncatedConeGeometry } from "./geometries/truncated-cone-geometry.js";
+export type { ShaderModuleInputs } from "./shader-inputs.js";
+export { ShaderInputs as _ShaderInputs } from "./shader-inputs.js";
+export type { ComputationProps } from "./computation.js";
+export { Computation } from "./computation.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,YAAY,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAE/E,YAAY,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAE9D,YAAY,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAC,iBAAiB,EAAC,MAAM,sCAAsC,CAAC;AAEvE,YAAY,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAGpC,YAAY,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,YAAY,EAAC,qBAAqB,EAAC,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAGlD,YAAY,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,YAAY,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGpD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,YAAY,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAG3E,YAAY,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,gCAA6B;AAC9C,OAAO,EAAC,SAAS,EAAC,kCAA+B;AACjD,YAAY,EAAC,cAAc,EAAC,4CAAyC;AAErE,OAAO,EAAC,qBAAqB,EAAC,oDAAiD;AAE/E,YAAY,EAAC,kBAAkB,EAAC,2CAAwC;AACxE,OAAO,EAAC,aAAa,EAAC,2CAAwC;AAE9D,YAAY,EAAC,sBAAsB,EAAC,gDAA6C;AACjF,OAAO,EAAC,iBAAiB,EAAC,gDAA6C;AAEvE,YAAY,EAAC,UAAU,EAAC,yBAAsB;AAC9C,OAAO,EAAC,KAAK,EAAC,yBAAsB;AAGpC,YAAY,EAAC,oBAAoB,EAAC,wCAAqC;AACvE,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,YAAY,EAAC,qBAAqB,EAAC,yCAAsC;AACzE,OAAO,EAAC,gBAAgB,EAAC,yCAAsC;AAE/D,OAAO,EAAC,eAAe,EAAC,kCAA+B;AACvD,OAAO,EAAC,aAAa,EAAC,gCAA6B;AAGnD,OAAO,EAAC,SAAS,EAAC,4BAAyB;AAG3C,OAAO,EAAC,cAAc,EAAC,wCAAqC;AAC5D,OAAO,EAAC,SAAS,EAAC,mCAAgC;AAClD,YAAY,EAAC,cAAc,EAAC,mCAAgC;AAC5D,OAAO,EAAC,SAAS,EAAC,mCAAgC;AAGlD,YAAY,EAAC,aAAa,EAAC,+BAA4B;AACvD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,YAAY,EAAC,gBAAgB,EAAC,mCAAgC;AAC9D,OAAO,EAAC,WAAW,EAAC,mCAAgC;AAGpD,YAAY,EAAC,iBAAiB,EAAC,sCAAmC;AAClE,OAAO,EAAC,YAAY,EAAC,sCAAmC;AACxD,YAAY,EAAC,iBAAiB,EAAC,sCAAmC;AAClE,OAAO,EAAC,YAAY,EAAC,sCAAmC;AACxD,YAAY,EAAC,qBAAqB,EAAC,0CAAuC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,0CAAuC;AAChE,YAAY,EAAC,sBAAsB,EAAC,4CAAyC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,4CAAyC;AACnE,YAAY,EAAC,kBAAkB,EAAC,uCAAoC;AACpE,OAAO,EAAC,aAAa,EAAC,uCAAoC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,wCAAqC;AACtE,OAAO,EAAC,cAAc,EAAC,wCAAqC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,gDAA6C;AACrF,OAAO,EAAC,qBAAqB,EAAC,gDAA6C;AAG3E,YAAY,EAAC,kBAAkB,EAAC,2BAAwB;AACxD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,2BAAwB;AAC9D,YAAY,EAAC,gBAAgB,EAAC,yBAAsB;AACpD,OAAO,EAAC,WAAW,EAAC,yBAAsB"}

package/dist/index.js

@@ -1,27 +1,29 @@
 // luma.gl Engine API
 // Animation
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
-export { AnimationLoopTemplate } from './animation-loop/animation-loop-template';
-export { AnimationLoop } from './animation-loop/animation-loop';
-export { makeAnimationLoop } from './animation-loop/make-animation-loop';
-export { Model } from './model/model';
-export { BufferTransform } from './transform/buffer-transform';
-export { TextureTransform } from './transform/texture-transform';
-export { PipelineFactory } from './lib/pipeline-factory';
+export { Timeline } from "./animation/timeline.js";
+export { KeyFrames } from "./animation/key-frames.js";
+export { AnimationLoopTemplate } from "./animation-loop/animation-loop-template.js";
+export { AnimationLoop } from "./animation-loop/animation-loop.js";
+export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
+export { Model } from "./model/model.js";
+export { BufferTransform } from "./transform/buffer-transform.js";
+export { TextureTransform } from "./transform/texture-transform.js";
+export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ShaderFactory } from "./lib/shader-factory.js";
 // Utils
-export { ClipSpace } from './lib/clip-space';
+export { ClipSpace } from "./lib/clip-space.js";
 // Scenegraph Core nodes
-export { ScenegraphNode } from './scenegraph/scenegraph-node';
-export { GroupNode } from './scenegraph/group-node';
-export { ModelNode } from './scenegraph/model-node';
-export { Geometry } from './geometry/geometry';
-export { GPUGeometry } from './geometry/gpu-geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export { ShaderInputs as _ShaderInputs } from './shader-inputs';
+export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
+export { GroupNode } from "./scenegraph/group-node.js";
+export { ModelNode } from "./scenegraph/model-node.js";
+export { Geometry } from "./geometry/geometry.js";
+export { GPUGeometry } from "./geometry/gpu-geometry.js";
+export { ConeGeometry } from "./geometries/cone-geometry.js";
+export { CubeGeometry } from "./geometries/cube-geometry.js";
+export { CylinderGeometry } from "./geometries/cylinder-geometry.js";
+export { IcoSphereGeometry } from "./geometries/ico-sphere-geometry.js";
+export { PlaneGeometry } from "./geometries/plane-geometry.js";
+export { SphereGeometry } from "./geometries/sphere-geometry.js";
+export { TruncatedConeGeometry } from "./geometries/truncated-cone-geometry.js";
+export { ShaderInputs as _ShaderInputs } from "./shader-inputs.js";
+export { Computation } from "./computation.js";

package/dist/lib/clip-space.d.ts

@@ -1,5 +1,5 @@
 import { Device } from '@luma.gl/core';
-import { Model, ModelProps } from '../model/model';
+import { Model, ModelProps } from "../model/model.js";
 /**
  * A flat geometry that covers the "visible area" that the GPU renders.
  */

package/dist/lib/clip-space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAO,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAwBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,aAAa,GAAG,UAAU,CAAC;CAqBtF"}
+{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAO,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,0BAAuB;AAwBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,aAAa,GAAG,UAAU,CAAC;CAkBtF"}

package/dist/lib/clip-space.js

@@ -1,22 +1,20 @@
 // ClipSpace
 import { glsl } from '@luma.gl/core';
-import { Model } from '../model/model';
-import { Geometry } from '../geometry/geometry';
-const CLIPSPACE_VERTEX_SHADER = glsl `\
+import { Model } from "../model/model.js";
+import { Geometry } from "../geometry/geometry.js";
+const CLIPSPACE_VERTEX_SHADER = `\
 #version 300 es
 in vec2 aClipSpacePosition;
 in vec2 aTexCoord;
 in vec2 aCoordinate;
-
 out vec2 position;
 out vec2 coordinate;
 out vec2 uv;
-
 void main(void) {
-  gl_Position = vec4(aClipSpacePosition, 0., 1.);
-  position = aClipSpacePosition;
-  coordinate = aCoordinate;
-  uv = aTexCoord;
+gl_Position = vec4(aClipSpacePosition, 0., 1.);
+position = aClipSpacePosition;
+coordinate = aCoordinate;
+uv = aTexCoord;
 }
 `;
 /* eslint-disable indent, no-multi-spaces */
@@ -26,7 +24,7 @@ const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
  */
 export class ClipSpace extends Model {
     constructor(device, opts) {
-        const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));
+        const TEX_COORDS = POSITIONS.map(coord => (coord === -1 ? 0 : coord));
         super(device, {
             ...opts,
             vs: CLIPSPACE_VERTEX_SHADER,

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

@@ -1,5 +1,5 @@
-import type { RenderPipelineProps } from '@luma.gl/core';
-import { Device, RenderPipeline } from '@luma.gl/core';
+import type { RenderPipelineProps, ComputePipelineProps } from '@luma.gl/core';
+import { Device, RenderPipeline, ComputePipeline } from '@luma.gl/core';
 export type PipelineFactoryProps = RenderPipelineProps;
 /**
  * Efficiently creates / caches pipelines
@@ -9,12 +9,16 @@ export declare class PipelineFactory {
     readonly device: Device;
     private _hashCounter;
     private readonly _hashes;
-    private readonly _useCounts;
-    private readonly _pipelineCache;
+    private readonly _renderPipelineCache;
+    private readonly _computePipelineCache;
+    /** Get the singleton default pipeline factory for the specified device */
     static getDefaultPipelineFactory(device: Device): PipelineFactory;
     constructor(device: Device);
-    createRenderPipeline(options: PipelineFactoryProps): RenderPipeline;
-    release(pipeline: RenderPipeline): void;
+    /** Return a RenderPipeline matching props. Reuses a similar pipeline if already created. */
+    createRenderPipeline(props: RenderPipelineProps): RenderPipeline;
+    createComputePipeline(props: ComputePipelineProps): ComputePipeline;
+    release(pipeline: RenderPipeline | ComputePipeline): void;
+    private _hashComputePipeline;
     /** Calculate a hash based on all the inputs for a render pipeline */
     private _hashRenderPipeline;
     private _getHash;

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAoC;IAEvF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAMrD,MAAM,EAAE,MAAM;IAI1B,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc;IAkBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAYvC,qEAAqE;IACrE,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,QAAQ;CAMjB"}
+{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAoC;IAEvF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAG9B;IACP,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAG/B;IAEP,0EAA0E;IAC1E,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAMrD,MAAM,EAAE,MAAM;IAI1B,4FAA4F;IAC5F,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,GAAG,cAAc;IAkBhE,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,eAAe;IAkBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI;IAYzD,OAAO,CAAC,oBAAoB;IAK5B,qEAAqE;IACrE,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,QAAQ;CAMjB"}

package/dist/lib/pipeline-factory.js

@@ -1,4 +1,7 @@
-import { RenderPipeline } from '@luma.gl/core';
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { RenderPipeline, ComputePipeline } from '@luma.gl/core';
 /**
  * Efficiently creates / caches pipelines
  */
@@ -7,8 +10,9 @@ export class PipelineFactory {
     device;
     _hashCounter = 0;
     _hashes = {};
-    _useCounts = {};
-    _pipelineCache = {};
+    _renderPipelineCache = {};
+    _computePipelineCache = {};
+    /** Get the singleton default pipeline factory for the specified device */
     static getDefaultPipelineFactory(device) {
         device._lumaData.defaultPipelineFactory =
             device._lumaData.defaultPipelineFactory || new PipelineFactory(device);
@@ -17,28 +21,49 @@ export class PipelineFactory {
     constructor(device) {
         this.device = device;
     }
-    createRenderPipeline(options) {
-        const props = { ...PipelineFactory.defaultProps, ...options };
-        const hash = this._hashRenderPipeline({ ...props });
-        if (!this._pipelineCache[hash]) {
-            const pipeline = this.device.createRenderPipeline({ ...props });
+    /** Return a RenderPipeline matching props. Reuses a similar pipeline if already created. */
+    createRenderPipeline(props) {
+        const allProps = { ...RenderPipeline.defaultProps, ...props };
+        const hash = this._hashRenderPipeline(allProps);
+        if (!this._renderPipelineCache[hash]) {
+            const pipeline = this.device.createRenderPipeline({
+                ...allProps,
+                id: allProps.id ? `${allProps.id}-cached` : undefined
+            });
             pipeline.hash = hash;
-            this._pipelineCache[hash] = pipeline;
-            this._useCounts[hash] = 0;
+            this._renderPipelineCache[hash] = { pipeline, useCount: 0 };
         }
-        this._useCounts[hash]++;
-        return this._pipelineCache[hash];
+        this._renderPipelineCache[hash].useCount++;
+        return this._renderPipelineCache[hash].pipeline;
+    }
+    createComputePipeline(props) {
+        const allProps = { ...ComputePipeline.defaultProps, ...props };
+        const hash = this._hashComputePipeline(allProps);
+        if (!this._computePipelineCache[hash]) {
+            const pipeline = this.device.createComputePipeline({
+                ...allProps,
+                id: allProps.id ? `${allProps.id}-cached` : undefined
+            });
+            pipeline.hash = hash;
+            this._computePipelineCache[hash] = { pipeline, useCount: 0 };
+        }
+        this._computePipelineCache[hash].useCount++;
+        return this._computePipelineCache[hash].pipeline;
     }
     release(pipeline) {
         const hash = pipeline.hash;
-        this._useCounts[hash]--;
-        if (this._useCounts[hash] === 0) {
-            this._pipelineCache[hash].destroy();
-            delete this._pipelineCache[hash];
-            delete this._useCounts[hash];
+        const cache = pipeline instanceof ComputePipeline ? this._computePipelineCache : this._renderPipelineCache;
+        cache[hash].useCount--;
+        if (cache[hash].useCount === 0) {
+            cache[hash].pipeline.destroy();
+            delete cache[hash];
         }
     }
     // PRIVATE
+    _hashComputePipeline(props) {
+        const shaderHash = this._getHash(props.shader.source);
+        return `${shaderHash}`;
+    }
     /** Calculate a hash based on all the inputs for a render pipeline */
     _hashRenderPipeline(props) {
         const vsHash = this._getHash(props.vs.source);
@@ -48,16 +73,16 @@ export class PipelineFactory {
         // const varyingHashes = varyings.map((v) => this._getHash(v));
         const varyingHash = '-'; // `${varyingHashes.join('/')}B${bufferMode}`
         const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
-        switch (this.device.info.type) {
-            case 'webgpu':
+        switch (this.device.type) {
+            // case 'webgl':
+            // WebGL is more dynamic
+            // return `${vsHash}/${fsHash}V${varyingHash}BL${bufferLayoutHash}`;
+            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 `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}`;
-            default:
-                // WebGL is more dynamic
-                return `${vsHash}/${fsHash}V${varyingHash}BL${bufferLayoutHash}`;
         }
     }
     _getHash(key) {

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

@@ -0,0 +1,17 @@
+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>;
+    readonly device: Device;
+    private readonly _cache;
+    /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
+    static getDefaultShaderFactory(device: Device): ShaderFactory;
+    /** @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;
+    private _hashShader;
+}
+//# sourceMappingURL=shader-factory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shader-factory.d.ts","sourceRoot":"","sources":["../../src/lib/shader-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA4B;IAE/E,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0D;IAEjF,iGAAiG;IACjG,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAK7D,gBAAgB;gBACJ,MAAM,EAAE,MAAM;IAI1B,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IAgBxC,wFAAwF;IACxF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAc7B,OAAO,CAAC,WAAW;CAGpB"}

package/dist/lib/shader-factory.js

@@ -0,0 +1,46 @@
+import { Shader } from '@luma.gl/core';
+/** Manages a cached pool of Shaders for reuse. */
+export class ShaderFactory {
+    static defaultProps = { ...Shader.defaultProps };
+    device;
+    _cache = {};
+    /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
+    static getDefaultShaderFactory(device) {
+        device._lumaData.defaultShaderFactory ||= new ShaderFactory(device);
+        return device._lumaData.defaultShaderFactory;
+    }
+    /** @internal */
+    constructor(device) {
+        this.device = device;
+    }
+    /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
+    createShader(props) {
+        const key = this._hashShader(props);
+        let cacheEntry = this._cache[key];
+        if (!cacheEntry) {
+            const shader = this.device.createShader({
+                ...props,
+                id: props.id ? `${props.id}-cached` : undefined
+            });
+            this._cache[key] = cacheEntry = { shader, useCount: 0 };
+        }
+        cacheEntry.useCount++;
+        return cacheEntry.shader;
+    }
+    /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
+    release(shader) {
+        const key = this._hashShader(shader);
+        const cacheEntry = this._cache[key];
+        if (cacheEntry) {
+            cacheEntry.useCount--;
+            if (cacheEntry.useCount === 0) {
+                delete this._cache[key];
+                cacheEntry.shader.destroy();
+            }
+        }
+    }
+    // PRIVATE
+    _hashShader(value) {
+        return `${value.stage}:${value.source}`;
+    }
+}

package/dist/model/model.d.ts

@@ -1,33 +1,25 @@
 import type { TypedArray, RenderPipelineProps, RenderPipelineParameters } from '@luma.gl/core';
 import type { BufferLayout, VertexArray, TransformFeedback } from '@luma.gl/core';
 import type { AttributeInfo, Binding, UniformValue, PrimitiveTopology } from '@luma.gl/core';
-import { Device, Buffer, RenderPipeline, RenderPass, UniformStore } from '@luma.gl/core';
+import { Device, Buffer } from '@luma.gl/core';
+import { RenderPipeline, RenderPass, UniformStore } from '@luma.gl/core';
 import type { ShaderModule, PlatformInfo } from '@luma.gl/shadertools';
 import { ShaderAssembler } from '@luma.gl/shadertools';
-import { ShaderInputs } from '../shader-inputs';
-import type { Geometry } from '../geometry/geometry';
-import { GPUGeometry } from '../geometry/gpu-geometry';
-import { PipelineFactory } from '../lib/pipeline-factory';
+import type { Geometry } from "../geometry/geometry.js";
+import { GPUGeometry } from "../geometry/gpu-geometry.js";
+import { ShaderInputs } from "../shader-inputs.js";
+import { PipelineFactory } from "../lib/pipeline-factory.js";
+import { ShaderFactory } from "../lib/shader-factory.js";
 export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     source?: string;
-    vs: {
-        glsl?: string;
-        wgsl?: string;
-    } | string | null;
-    fs: {
-        glsl?: string;
-        wgsl?: string;
-    } | string | null;
+    vs: string | null;
+    fs: string | null;
     /** shadertool shader modules (added to shader code) */
     modules?: ShaderModule[];
     /** Shadertool module defines (configures shader code)*/
     defines?: Record<string, string | number | boolean>;
     /** Shader inputs, used to generated uniform buffers and bindings */
     shaderInputs?: ShaderInputs;
-    /** pipeline factory to use to create render pipelines. Defaults to default factory for the device */
-    pipelineFactory?: PipelineFactory;
-    /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */
-    shaderAssembler?: ShaderAssembler;
     /** Parameters that are built into the pipeline */
     parameters?: RenderPipelineParameters;
     /** Geometry */
@@ -41,11 +33,21 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     attributes?: Record<string, Buffer>;
     /**   */
     constantAttributes?: Record<string, TypedArray>;
+    /** Some applications intentionally supply unused attributes */
+    ignoreUnknownAttributes?: boolean;
     /** @internal For use with {@link TransformFeedback}, WebGL only. */
     varyings?: string[];
     transformFeedback?: TransformFeedback;
     /** Mapped uniforms for shadertool modules */
     moduleSettings?: Record<string, Record<string, any>>;
+    /** Show shader source in browser? */
+    debugShaders?: 'never' | 'errors' | 'warnings' | 'always';
+    /** Factory used to create a {@link RenderPipeline}. Defaults to {@link Device} default factory. */
+    pipelineFactory?: PipelineFactory;
+    /** Factory used to create a {@link Shader}. Defaults to {@link Device} default factory. */
+    shaderFactory?: ShaderFactory;
+    /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */
+    shaderAssembler?: ShaderAssembler;
 };
 /**
  * v9 Model API
@@ -59,9 +61,11 @@ export declare class Model {
     static defaultProps: Required<ModelProps>;
     readonly device: Device;
     readonly id: string;
+    readonly source: string;
     readonly vs: string;
     readonly fs: string;
     readonly pipelineFactory: PipelineFactory;
+    readonly shaderFactory: ShaderFactory;
     userData: {
         [key: string]: any;
     };
@@ -98,27 +102,29 @@ export declare class Model {
     /** ShaderInputs instance */
     shaderInputs: ShaderInputs;
     _uniformStore: UniformStore;
-    _pipelineNeedsUpdate: string | false;
     _attributeInfos: Record<string, AttributeInfo>;
     _gpuGeometry: GPUGeometry | null;
     private _getModuleUniforms;
     private props;
+    _pipelineNeedsUpdate: string | false;
+    private _needsRedraw;
+    private _destroyed;
+    /** "Time" of last draw. Monotonically increasing timestamp */
+    _lastDrawTimestamp: number;
     constructor(device: Device, props: ModelProps);
     destroy(): void;
+    /** Query redraw status. Clears the status. */
+    needsRedraw(): false | string;
+    /** Mark the model as needing a redraw */
+    setNeedsRedraw(reason: string): void;
     predraw(): void;
-    draw(renderPass: RenderPass): void;
+    draw(renderPass: RenderPass): boolean;
     /**
      * Updates the optional geometry
      * Geometry, set topology and bufferLayout
      * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
      */
-    setGeometry(geometry: GPUGeometry | Geometry): GPUGeometry;
-    /**
-     * Updates the optional geometry attributes
-     * Geometry, sets several attributes, indexBuffer, and also vertex count
-     * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
-     */
-    _setGeometryAttributes(gpuGeometry: GPUGeometry): void;
+    setGeometry(geometry: GPUGeometry | Geometry | null): void;
     /**
      * Updates the primitive topology ('triangle-list', 'triangle-strip' etc).
      * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU
@@ -126,7 +132,7 @@ export declare class Model {
     setTopology(topology: PrimitiveTopology): void;
     /**
      * Updates the buffer layout.
-     * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU
+     * @note Triggers a pipeline rebuild / pipeline cache fetch
      */
     setBufferLayout(bufferLayout: BufferLayout[]): void;
     /**
@@ -146,40 +152,27 @@ export declare class Model {
      */
     setInstanceCount(instanceCount: number): void;
     setShaderInputs(shaderInputs: ShaderInputs): void;
-    /**
-     * Updates shader module settings (which results in uniforms being set)
-     */
-    setShaderModuleProps(props: Record<string, any>): void;
     updateShaderInputs(): void;
-    /**
-     * @deprecated Updates shader module settings (which results in uniforms being set)
-     */
-    updateModuleSettings(props: Record<string, any>): void;
     /**
      * Sets bindings (textures, samplers, uniform buffers)
      */
     setBindings(bindings: Record<string, Binding>): void;
     /**
-     * Sets individual uniforms
-     * @deprecated WebGL only, use uniform buffers for portability
-     * @param uniforms
-     * @returns self for chaining
+     * Updates optional transform feedback. WebGL only.
      */
-    setUniforms(uniforms: Record<string, UniformValue>): void;
+    setTransformFeedback(transformFeedback: TransformFeedback | null): void;
     /**
      * Sets the index buffer
      * @todo - how to unset it if we change geometry?
      */
     setIndexBuffer(indexBuffer: Buffer | null): void;
-    /**
-     * Updates optional transform feedback. WebGL only.
-     */
-    setTransformFeedback(transformFeedback: TransformFeedback | null): void;
     /**
      * Sets attributes (buffers)
      * @note Overrides any attributes previously set with the same name
      */
-    setAttributes(buffers: Record<string, Buffer>, _option?: 'ignore-unknown'): void;
+    setAttributes(buffers: Record<string, Buffer>, options?: {
+        ignoreUnknownAttributes?: boolean;
+    }): void;
     /**
      * Sets constant attributes
      * @note Overrides any attributes previously set with the same name
@@ -189,7 +182,27 @@ export declare class Model {
      * @param constantAttributes
      */
     setConstantAttributes(attributes: Record<string, TypedArray>): void;
+    /**
+     * Sets individual uniforms
+     * @deprecated WebGL only, use uniform buffers for portability
+     * @param uniforms
+     */
+    setUniforms(uniforms: Record<string, UniformValue>): void;
+    /**
+     * @deprecated Updates shader module settings (which results in uniforms being set)
+     */
+    updateModuleSettings(props: Record<string, any>): void;
+    /** Get the timestamp of the latest updated bound GPU memory resource (buffer/texture). */
+    _getBindingsUpdateTimestamp(): number;
+    /**
+     * Updates the optional geometry attributes
+     * Geometry, sets several attributes, indexBuffer, and also vertex count
+     * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
+     */
+    _setGeometryAttributes(gpuGeometry: GPUGeometry): void;
+    /** Mark pipeline as needing update */
     _setPipelineNeedsUpdate(reason: string): void;
+    /** Update pipeline if needed */
     _updatePipeline(): RenderPipeline;
     /** Throttle draw call logging */
     _lastLogTime: number;