@luma.gl/engine 9.2.6 → 9.3.0-alpha.11

package/dist/model/model.d.ts

@@ -1,14 +1,12 @@
-import type { TypedArray } from '@math.gl/types';
-import type { RenderPipelineProps, RenderPipelineParameters, BufferLayout, VertexArray, TransformFeedback, AttributeInfo, Binding, PrimitiveTopology } from '@luma.gl/core';
-import { Device, Buffer, RenderPipeline, RenderPass, UniformStore } from '@luma.gl/core';
-import type { ShaderModule, PlatformInfo } from '@luma.gl/shadertools';
+import { type TypedArray } from '@math.gl/types';
+import { type RenderPipelineProps, type RenderPipelineParameters, type BufferLayout, type VertexArray, type TransformFeedback, type AttributeInfo, type Binding, type BindingsByGroup, type PrimitiveTopology, Device, Buffer, RenderPipeline, RenderPass, PipelineFactory, ShaderFactory, UniformStore } from '@luma.gl/core';
+import type { ShaderBindingDebugRow, ShaderModule, PlatformInfo } from '@luma.gl/shadertools';
 import { ShaderAssembler } from '@luma.gl/shadertools';
 import type { Geometry } from "../geometry/geometry.js";
 import { GPUGeometry } from "../geometry/gpu-geometry.js";
-import { PipelineFactory } from "../factories/pipeline-factory.js";
-import { ShaderFactory } from "../factories/shader-factory.js";
 import { ShaderInputs } from "../shader-inputs.js";
-import { AsyncTexture } from "../async-texture/async-texture.js";
+import { DynamicTexture } from "../dynamic-texture/dynamic-texture.js";
+import { Material } from "../material/material.js";
 export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs' | 'bindings'> & {
     source?: string;
     vs?: string | null;
@@ -19,8 +17,12 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs' | 'bindings'> & {
     defines?: Record<string, boolean>;
     /** Shader inputs, used to generated uniform buffers and bindings */
     shaderInputs?: ShaderInputs;
+    /** Material-owned group-3 bindings */
+    material?: Material;
     /** Bindings */
-    bindings?: Record<string, Binding | AsyncTexture>;
+    bindings?: Record<string, Binding | DynamicTexture>;
+    /** WebGL-only uniforms */
+    uniforms?: Record<string, unknown>;
     /** Parameters that are built into the pipeline */
     parameters?: RenderPipelineParameters;
     /** Geometry */
@@ -51,22 +53,37 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs' | 'bindings'> & {
     shaderAssembler?: ShaderAssembler;
 };
 /**
- * v9 Model API
- * A model
- * - automatically reuses pipelines (programs) when possible
- * - automatically rebuilds pipelines if necessary to accommodate changed settings
- * shadertools integration
- * - accepts modules and performs shader transpilation
+ * High level draw API for luma.gl.
+ *
+ * A `Model` encapsulates shaders, geometry attributes, bindings and render
+ * pipeline state into a single object. It automatically reuses and rebuilds
+ * pipelines as render parameters change and exposes convenient hooks for
+ * updating uniforms and attributes.
+ *
+ * Features:
+ * - Reuses and lazily recompiles {@link RenderPipeline | pipelines} as needed.
+ * - Integrates with `@luma.gl/shadertools` to assemble GLSL or WGSL from shader modules.
+ * - Manages geometry attributes and buffer bindings.
+ * - Accepts textures, samplers and uniform buffers as bindings, including `DynamicTexture`.
+ * - Provides detailed debug logging and optional shader source inspection.
  */
 export declare class Model {
     static defaultProps: Required<ModelProps>;
+    /** Device that created this model */
     readonly device: Device;
+    /** Application provided identifier */
     readonly id: string;
+    /** WGSL shader source when using unified shader */
     readonly source: string;
+    /** GLSL vertex shader source */
     readonly vs: string;
+    /** GLSL fragment shader source */
     readonly fs: string;
+    /** Factory used to create render pipelines */
     readonly pipelineFactory: PipelineFactory;
+    /** Factory used to create shaders */
     readonly shaderFactory: ShaderFactory;
+    /** User-supplied per-model data */
     userData: {
         [key: string]: any;
     };
@@ -89,7 +106,7 @@ export declare class Model {
     /** Constant-valued attributes */
     constantAttributes: Record<string, TypedArray>;
     /** Bindings (textures, samplers, uniform buffers) */
-    bindings: Record<string, Binding | AsyncTexture>;
+    bindings: Record<string, Binding | DynamicTexture>;
     /**
      * VertexArray
      * @note not implemented: if bufferLayout is updated, vertex array has to be rebuilt!
@@ -102,6 +119,7 @@ export declare class Model {
     pipeline: RenderPipeline;
     /** ShaderInputs instance */
     shaderInputs: ShaderInputs;
+    material: Material | null;
     _uniformStore: UniformStore;
     _attributeInfos: Record<string, AttributeInfo>;
     _gpuGeometry: GPUGeometry | null;
@@ -111,6 +129,7 @@ export declare class Model {
     private _destroyed;
     /** "Time" of last draw. Monotonically increasing timestamp */
     _lastDrawTimestamp: number;
+    private _bindingTable;
     get [Symbol.toStringTag](): string;
     toString(): string;
     constructor(device: Device, props: ModelProps);
@@ -119,7 +138,15 @@ export declare class Model {
     needsRedraw(): false | string;
     /** Mark the model as needing a redraw */
     setNeedsRedraw(reason: string): void;
+    /** Returns WGSL binding debug rows for the assembled shader. Returns an empty array for GLSL models. */
+    getBindingDebugTable(): readonly ShaderBindingDebugRow[];
+    /** Update uniforms and pipeline state prior to drawing. */
     predraw(): void;
+    /**
+     * Issue one draw call.
+     * @param renderPass - render pass to draw into
+     * @returns `true` if the draw call was executed, `false` if resources were not ready.
+     */
     draw(renderPass: RenderPass): boolean;
     /**
      * Updates the optional geometry
@@ -155,12 +182,13 @@ export declare class Model {
     setVertexCount(vertexCount: number): void;
     /** Set the shader inputs */
     setShaderInputs(shaderInputs: ShaderInputs): void;
+    setMaterial(material: Material | null): void;
     /** Update uniform buffers from the model's shader inputs */
     updateShaderInputs(): void;
     /**
      * Sets bindings (textures, samplers, uniform buffers)
      */
-    setBindings(bindings: Record<string, Binding | AsyncTexture>): void;
+    setBindings(bindings: Record<string, Binding | DynamicTexture>): void;
     /**
      * Updates optional transform feedback. WebGL only.
      */
@@ -192,6 +220,8 @@ export declare class Model {
     _areBindingsLoading(): string | false;
     /** Extracts texture view from loaded async textures. Returns null if any textures have not yet been loaded. */
     _getBindings(): Record<string, Binding>;
+    _getBindGroups(): BindingsByGroup;
+    _getBindGroupCacheKeys(): Partial<Record<number, object>>;
     /** Get the timestamp of the latest updated bound GPU memory resource (buffer/texture). */
     _getBindingsUpdateTimestamp(): number;
     /**
@@ -213,6 +243,7 @@ export declare class Model {
     _logFramebuffer(renderPass: RenderPass): void;
     _getAttributeDebugTable(): Record<string, Record<string, unknown>>;
     _getBufferOrConstantValues(attribute: Buffer | TypedArray, dataType: any): string;
+    private _getNonMaterialBindings;
 }
 /** Create a shadertools platform info from the Device */
 export declare function getPlatformInfo(device: Device): PlatformInfo;

package/dist/model/model.d.ts.map

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

package/dist/model/model.js

@@ -1,28 +1,35 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Buffer, Texture, TextureView, Sampler, RenderPipeline, UniformStore, log, getTypedArrayConstructor, getAttributeInfosFromLayouts } from '@luma.gl/core';
-import { ShaderAssembler, getShaderLayoutFromWGSL } from '@luma.gl/shadertools';
+import { Buffer, Texture, TextureView, Sampler, RenderPipeline, PipelineFactory, ShaderFactory, UniformStore, log, dataTypeDecoder, getAttributeInfosFromLayouts, normalizeBindingsByGroup } from '@luma.gl/core';
+import { ShaderAssembler } from '@luma.gl/shadertools';
 import { makeGPUGeometry } from "../geometry/gpu-geometry.js";
-import { PipelineFactory } from "../factories/pipeline-factory.js";
-import { ShaderFactory } from "../factories/shader-factory.js";
 import { getDebugTableForShaderLayout } from "../debug/debug-shader-layout.js";
 import { debugFramebuffer } from "../debug/debug-framebuffer.js";
 import { deepEqual } from "../utils/deep-equal.js";
 import { BufferLayoutHelper } from "../utils/buffer-layout-helper.js";
 import { sortedBufferLayoutByShaderSourceLocations } from "../utils/buffer-layout-order.js";
+import { mergeShaderModuleBindingsIntoLayout, shaderModuleHasUniforms } from "../utils/shader-module-utils.js";
 import { uid } from "../utils/uid.js";
 import { ShaderInputs } from "../shader-inputs.js";
-import { AsyncTexture } from "../async-texture/async-texture.js";
+import { DynamicTexture } from "../dynamic-texture/dynamic-texture.js";
 const LOG_DRAW_PRIORITY = 2;
 const LOG_DRAW_TIMEOUT = 10000;
+const PIPELINE_INITIALIZATION_FAILED = 'render pipeline initialization failed';
 /**
- * v9 Model API
- * A model
- * - automatically reuses pipelines (programs) when possible
- * - automatically rebuilds pipelines if necessary to accommodate changed settings
- * shadertools integration
- * - accepts modules and performs shader transpilation
+ * High level draw API for luma.gl.
+ *
+ * A `Model` encapsulates shaders, geometry attributes, bindings and render
+ * pipeline state into a single object. It automatically reuses and rebuilds
+ * pipelines as render parameters change and exposes convenient hooks for
+ * updating uniforms and attributes.
+ *
+ * Features:
+ * - Reuses and lazily recompiles {@link RenderPipeline | pipelines} as needed.
+ * - Integrates with `@luma.gl/shadertools` to assemble GLSL or WGSL from shader modules.
+ * - Manages geometry attributes and buffer bindings.
+ * - Accepts textures, samplers and uniform buffers as bindings, including `DynamicTexture`.
+ * - Provides detailed debug logging and optional shader source inspection.
  */
 export class Model {
     static defaultProps = {
@@ -39,11 +46,14 @@ export class Model {
         indexBuffer: null,
         attributes: {},
         constantAttributes: {},
+        bindings: {},
+        uniforms: {},
         varyings: [],
         isInstanced: undefined,
         instanceCount: 0,
         vertexCount: 0,
         shaderInputs: undefined,
+        material: undefined,
         pipelineFactory: undefined,
         shaderFactory: undefined,
         transformFeedback: undefined,
@@ -51,16 +61,24 @@ export class Model {
         debugShaders: undefined,
         disableWarnings: undefined
     };
+    /** Device that created this model */
     device;
+    /** Application provided identifier */
     id;
+    /** WGSL shader source when using unified shader */
     // @ts-expect-error assigned in function called from constructor
     source;
+    /** GLSL vertex shader source */
     // @ts-expect-error assigned in function called from constructor
     vs;
+    /** GLSL fragment shader source */
     // @ts-expect-error assigned in function called from constructor
     fs;
+    /** Factory used to create render pipelines */
     pipelineFactory;
+    /** Factory used to create shaders */
     shaderFactory;
+    /** User-supplied per-model data */
     userData = {};
     // Fixed properties (change can trigger pipeline rebuild)
     /** The render pipeline GPU parameters, depth testing etc */
@@ -97,6 +115,7 @@ export class Model {
     /** ShaderInputs instance */
     // @ts-expect-error Assigned in function called by constructor
     shaderInputs;
+    material = null;
     // @ts-expect-error Assigned in function called by constructor
     _uniformStore;
     _attributeInfos = {};
@@ -107,6 +126,7 @@ export class Model {
     _destroyed = false;
     /** "Time" of last draw. Monotonically increasing timestamp */
     _lastDrawTimestamp = -1;
+    _bindingTable = [];
     get [Symbol.toStringTag]() {
         return 'Model';
     }
@@ -119,6 +139,7 @@ export class Model {
         this.id = props.id || uid('model');
         this.device = device;
         Object.assign(this.userData, props.userData);
+        this.material = props.material || null;
         // Setup shader module inputs
         const moduleMap = Object.fromEntries(this.props.modules?.map(module => [module.name, module]) || []);
         const shaderInputs = props.shaderInputs ||
@@ -131,13 +152,15 @@ export class Model {
         const modules = 
         // @ts-ignore shaderInputs is assigned in setShaderInputs above.
         (this.props.modules?.length > 0 ? this.props.modules : this.shaderInputs?.getModules()) || [];
+        this.props.shaderLayout =
+            mergeShaderModuleBindingsIntoLayout(this.props.shaderLayout, modules) || null;
         const isWebGPU = this.device.type === 'webgpu';
         // WebGPU
         // TODO - hack to support unified WGSL shader
         // TODO - this is wrong, compile a single shader
         if (isWebGPU && this.props.source) {
             // WGSL
-            const { source, getUniforms } = this.props.shaderAssembler.assembleWGSLShader({
+            const { source, getUniforms, bindingTable } = this.props.shaderAssembler.assembleWGSLShader({
                 platformInfo,
                 ...this.props,
                 modules
@@ -145,8 +168,11 @@ export class Model {
             this.source = source;
             // @ts-expect-error
             this._getModuleUniforms = getUniforms;
+            this._bindingTable = bindingTable;
             // Extract shader layout after modules have been added to WGSL source, to include any bindings added by modules
-            this.props.shaderLayout ||= getShaderLayoutFromWGSL(this.source);
+            const inferredShaderLayout = device.getShaderLayout?.(this.source);
+            this.props.shaderLayout =
+                mergeShaderModuleBindingsIntoLayout(this.props.shaderLayout || inferredShaderLayout || null, modules) || null;
         }
         else {
             // GLSL
@@ -159,6 +185,7 @@ export class Model {
             this.fs = fs;
             // @ts-expect-error
             this._getModuleUniforms = getUniforms;
+            this._bindingTable = [];
         }
         this.vertexCount = this.props.vertexCount;
         this.instanceCount = this.props.instanceCount;
@@ -208,8 +235,6 @@ export class Model {
         if (props.transformFeedback) {
             this.transformFeedback = props.transformFeedback;
         }
-        // Catch any access to non-standard props
-        Object.seal(this);
     }
     destroy() {
         if (!this._destroyed) {
@@ -217,7 +242,7 @@ export class Model {
             this.pipelineFactory.release(this.pipeline);
             // Release the shaders
             this.shaderFactory.release(this.pipeline.vs);
-            if (this.pipeline.fs) {
+            if (this.pipeline.fs && this.pipeline.fs !== this.pipeline.vs) {
                 this.shaderFactory.release(this.pipeline.fs);
             }
             this._uniformStore.destroy();
@@ -241,12 +266,22 @@ export class Model {
     setNeedsRedraw(reason) {
         this._needsRedraw ||= reason;
     }
+    /** Returns WGSL binding debug rows for the assembled shader. Returns an empty array for GLSL models. */
+    getBindingDebugTable() {
+        return this._bindingTable;
+    }
+    /** Update uniforms and pipeline state prior to drawing. */
     predraw() {
         // Update uniform buffers if needed
         this.updateShaderInputs();
         // Check if the pipeline is invalidated
         this.pipeline = this._updatePipeline();
     }
+    /**
+     * Issue one draw call.
+     * @param renderPass - render pass to draw into
+     * @returns `true` if the draw call was executed, `false` if resources were not ready.
+     */
     draw(renderPass) {
         const loadingBinding = this._areBindingsLoading();
         if (loadingBinding) {
@@ -261,6 +296,7 @@ export class Model {
             renderPass.popDebugGroup();
         }
         let drawSuccess;
+        let pipelineErrored = this.pipeline.isErrored;
         try {
             renderPass.pushDebugGroup(`${this}.draw(${renderPass})`);
             this._logDrawCallStart();
@@ -268,31 +304,40 @@ export class Model {
             // TODO - inside RenderPass is likely the worst place to do this from performance perspective.
             // Application can call Model.predraw() to avoid this.
             this.pipeline = this._updatePipeline();
-            // Set pipeline state, we may be sharing a pipeline so we need to set all state on every draw
-            // Any caching needs to be done inside the pipeline functions
-            // TODO this is a busy initialized check for all bindings every frame
-            const syncBindings = this._getBindings();
-            this.pipeline.setBindings(syncBindings, {
-                disableWarnings: this.props.disableWarnings
-            });
-            const { indexBuffer } = this.vertexArray;
-            const indexCount = indexBuffer
-                ? indexBuffer.byteLength / (indexBuffer.indexType === 'uint32' ? 4 : 2)
-                : undefined;
-            drawSuccess = this.pipeline.draw({
-                renderPass,
-                vertexArray: this.vertexArray,
-                isInstanced: this.isInstanced,
-                vertexCount: this.vertexCount,
-                instanceCount: this.instanceCount,
-                indexCount,
-                transformFeedback: this.transformFeedback || undefined,
-                // WebGL shares underlying cached pipelines even for models that have different parameters and topology,
-                // so we must provide our unique parameters to each draw
-                // (In WebGPU most parameters are encoded in the pipeline and cannot be changed per draw call)
-                parameters: this.parameters,
-                topology: this.topology
-            });
+            pipelineErrored = this.pipeline.isErrored;
+            if (pipelineErrored) {
+                log.info(LOG_DRAW_PRIORITY, `>>> DRAWING ABORTED ${this.id}: ${PIPELINE_INITIALIZATION_FAILED}`)();
+                drawSuccess = false;
+            }
+            else {
+                const syncBindings = this._getBindings();
+                const syncBindGroups = this._getBindGroups();
+                const { indexBuffer } = this.vertexArray;
+                const indexCount = indexBuffer
+                    ? indexBuffer.byteLength / (indexBuffer.indexType === 'uint32' ? 4 : 2)
+                    : undefined;
+                drawSuccess = this.pipeline.draw({
+                    renderPass,
+                    vertexArray: this.vertexArray,
+                    isInstanced: this.isInstanced,
+                    vertexCount: this.vertexCount,
+                    instanceCount: this.instanceCount,
+                    indexCount,
+                    transformFeedback: this.transformFeedback || undefined,
+                    // Pipelines may be shared across models when caching is enabled, so bindings
+                    // and WebGL uniforms must be supplied on every draw instead of being stored
+                    // on the pipeline instance.
+                    bindings: syncBindings,
+                    bindGroups: syncBindGroups,
+                    _bindGroupCacheKeys: this._getBindGroupCacheKeys(),
+                    uniforms: this.props.uniforms,
+                    // WebGL shares underlying cached pipelines even for models that have different parameters and topology,
+                    // so we must provide our unique parameters to each draw
+                    // (In WebGPU most parameters are encoded in the pipeline and cannot be changed per draw call)
+                    parameters: this.parameters,
+                    topology: this.topology
+                });
+            }
         }
         finally {
             renderPass.popDebugGroup();
@@ -304,6 +349,9 @@ export class Model {
             this._lastDrawTimestamp = this.device.timestamp;
             this._needsRedraw = false;
         }
+        else if (pipelineErrored) {
+            this._needsRedraw = PIPELINE_INITIALIZATION_FAILED;
+        }
         else {
             this._needsRedraw = 'waiting for resource initialization';
         }
@@ -397,20 +445,24 @@ export class Model {
     /** Set the shader inputs */
     setShaderInputs(shaderInputs) {
         this.shaderInputs = shaderInputs;
-        this._uniformStore = new UniformStore(this.shaderInputs.modules);
+        this._uniformStore = new UniformStore(this.device, this.shaderInputs.modules);
         // Create uniform buffer bindings for all modules that actually have uniforms
         for (const [moduleName, module] of Object.entries(this.shaderInputs.modules)) {
-            if (shaderModuleHasUniforms(module)) {
-                const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
+            if (shaderModuleHasUniforms(module) && !this.material?.ownsModule(moduleName)) {
+                const uniformBuffer = this._uniformStore.getManagedUniformBuffer(moduleName);
                 this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
             }
         }
         this.setNeedsRedraw('shaderInputs');
     }
+    setMaterial(material) {
+        this.material = material;
+        this.setNeedsRedraw('material');
+    }
     /** Update uniform buffers from the model's shader inputs */
     updateShaderInputs() {
         this._uniformStore.setUniforms(this.shaderInputs.getUniformValues());
-        this.setBindings(this.shaderInputs.getBindingValues());
+        this.setBindings(this._getNonMaterialBindings(this.shaderInputs.getBindingValues()));
         // TODO - this is already tracked through buffer/texture update times?
         this.setNeedsRedraw('shaderInputs');
     }
@@ -502,7 +554,12 @@ export class Model {
     /** Check that bindings are loaded. Returns id of first binding that is still loading. */
     _areBindingsLoading() {
         for (const binding of Object.values(this.bindings)) {
-            if (binding instanceof AsyncTexture && !binding.isReady) {
+            if (binding instanceof DynamicTexture && !binding.isReady) {
+                return binding.id;
+            }
+        }
+        for (const binding of Object.values(this.material?.bindings || {})) {
+            if (binding instanceof DynamicTexture && !binding.isReady) {
                 return binding.id;
             }
         }
@@ -512,7 +569,7 @@ export class Model {
     _getBindings() {
         const validBindings = {};
         for (const [name, binding] of Object.entries(this.bindings)) {
-            if (binding instanceof AsyncTexture) {
+            if (binding instanceof DynamicTexture) {
                 // Check that async textures are loaded
                 if (binding.isReady) {
                     validBindings[name] = binding.texture;
@@ -524,6 +581,27 @@ export class Model {
         }
         return validBindings;
     }
+    _getBindGroups() {
+        const shaderLayout = this.pipeline?.shaderLayout || this.props.shaderLayout || { bindings: [] };
+        const bindGroups = shaderLayout.bindings.length
+            ? normalizeBindingsByGroup(shaderLayout, this._getBindings())
+            : { 0: this._getBindings() };
+        if (!this.material) {
+            return bindGroups;
+        }
+        for (const [groupKey, groupBindings] of Object.entries(this.material.getBindingsByGroup())) {
+            const group = Number(groupKey);
+            bindGroups[group] = {
+                ...(bindGroups[group] || {}),
+                ...groupBindings
+            };
+        }
+        return bindGroups;
+    }
+    _getBindGroupCacheKeys() {
+        const bindGroupCacheKey = this.material?.getBindGroupCacheKey(3);
+        return bindGroupCacheKey ? { 3: bindGroupCacheKey } : {};
+    }
     /** Get the timestamp of the latest updated bound GPU memory resource (buffer/texture). */
     _getBindingsUpdateTimestamp() {
         let timestamp = 0;
@@ -534,7 +612,7 @@ export class Model {
             else if (binding instanceof Buffer || binding instanceof Texture) {
                 timestamp = Math.max(timestamp, binding.updateTimestamp);
             }
-            else if (binding instanceof AsyncTexture) {
+            else if (binding instanceof DynamicTexture) {
                 timestamp = binding.texture
                     ? Math.max(timestamp, binding.texture.updateTimestamp)
                     : // The texture will become available in the future
@@ -544,7 +622,7 @@ export class Model {
                 timestamp = Math.max(timestamp, binding.buffer.updateTimestamp);
             }
         }
-        return timestamp;
+        return Math.max(timestamp, this.material?.getBindingsUpdateTimestamp() || 0);
     }
     /**
      * Updates the optional geometry attributes
@@ -603,20 +681,20 @@ export class Model {
             }
             this.pipeline = this.pipelineFactory.createRenderPipeline({
                 ...this.props,
+                bindings: undefined,
                 bufferLayout: this.bufferLayout,
                 topology: this.topology,
                 parameters: this.parameters,
-                // TODO - why set bindings here when we reset them every frame?
-                // Should we expose a BindGroup abstraction?
-                bindings: this._getBindings(),
+                bindGroups: this._getBindGroups(),
                 vs,
                 fs
             });
             this._attributeInfos = getAttributeInfosFromLayouts(this.pipeline.shaderLayout, this.bufferLayout);
             if (prevShaderVs)
                 this.shaderFactory.release(prevShaderVs);
-            if (prevShaderFs)
+            if (prevShaderFs && prevShaderFs !== prevShaderVs) {
                 this.shaderFactory.release(prevShaderFs);
+            }
         }
         return this.pipeline;
     }
@@ -657,12 +735,11 @@ export class Model {
             // } || (this._drawCount++ > 3 && this._drawCount % 60)) {
             return;
         }
-        // TODO - display framebuffer output in debug window
         const framebuffer = renderPass.props.framebuffer;
-        if (framebuffer) {
-            debugFramebuffer(framebuffer, { id: framebuffer.id, minimap: true });
-            // log.image({logLevel: LOG_DRAW_PRIORITY, message: `${framebuffer.id} %c sup?`, image})();
-        }
+        debugFramebuffer(renderPass, framebuffer, {
+            id: framebuffer?.id || `${this.id}-framebuffer`,
+            minimap: true
+        });
     }
     _getAttributeDebugTable() {
         const table = {};
@@ -691,13 +768,22 @@ export class Model {
     }
     // TODO - fix typing of luma data types
     _getBufferOrConstantValues(attribute, dataType) {
-        const TypedArrayConstructor = getTypedArrayConstructor(dataType);
+        const TypedArrayConstructor = dataTypeDecoder.getTypedArrayConstructor(dataType);
         const typedArray = attribute instanceof Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
         return typedArray.toString();
     }
-}
-function shaderModuleHasUniforms(module) {
-    return Boolean(module.uniformTypes && !isObjectEmpty(module.uniformTypes));
+    _getNonMaterialBindings(bindings) {
+        if (!this.material) {
+            return bindings;
+        }
+        const filteredBindings = {};
+        for (const [name, binding] of Object.entries(bindings)) {
+            if (!this.material.ownsBinding(name)) {
+                filteredBindings[name] = binding;
+            }
+        }
+        return filteredBindings;
+    }
 }
 // HELPERS
 /** Create a shadertools platform info from the Device */
@@ -711,13 +797,4 @@ export function getPlatformInfo(device) {
         features: device.features
     };
 }
-/** Returns true if given object is empty, false otherwise. */
-function isObjectEmpty(obj) {
-    // @ts-ignore key is unused
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (const key in obj) {
-        return false;
-    }
-    return true;
-}
 //# sourceMappingURL=model.js.map