@luma.gl/webgpu 9.3.0-alpha.6 → 9.3.0-alpha.9

package/dist/adapter/resources/webgpu-compute-pipeline.d.ts

@@ -1,21 +1,19 @@
-import { ComputePipeline, ComputePipelineProps, Binding } from '@luma.gl/core';
+import { ComputePipeline, ComputePipelineProps, Bindings, BindingsByGroup } from '@luma.gl/core';
 import { WebGPUDevice } from "../webgpu-device.js";
 /** Creates a new compute pipeline when parameters change */
 export declare class WebGPUComputePipeline extends ComputePipeline {
     readonly device: WebGPUDevice;
     readonly handle: GPUComputePipeline;
-    /** For internal use to create BindGroups */
-    private _bindGroupLayout;
-    private _bindGroup;
-    /** For internal use to create BindGroups */
-    private _bindings;
+    private _bindingsByGroup;
+    private _bindGroupCacheKeysByGroup;
     constructor(device: WebGPUDevice, props: ComputePipelineProps);
     /**
      * @todo Use renderpass.setBindings() ?
      * @todo Do we want to expose BindGroups in the API and remove this?
      */
-    setBindings(bindings: Record<string, Binding>): void;
-    /** Return a bind group created by setBindings */
-    _getBindGroup(): GPUBindGroup;
+    setBindings(bindings: Bindings | BindingsByGroup): void;
+    _getBindGroups(bindings?: Bindings | BindingsByGroup, bindGroupCacheKeys?: Partial<Record<number, object>>): Partial<Record<number, unknown>>;
+    _getBindingsByGroupWebGPU(): BindingsByGroup;
+    _getBindGroupCacheKeysWebGPU(): Partial<Record<number, object>>;
 }
 //# sourceMappingURL=webgpu-compute-pipeline.d.ts.map

package/dist/adapter/resources/webgpu-compute-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-compute-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAO9C,4DAA4D;AAC5D,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAC/C,4CAA4C;IAC5C,OAAO,CAAC,SAAS,CAA0B;gBAE/B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAqB7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAkBpD,iDAAiD;IACjD,aAAa;CAWd"}
+{"version":3,"file":"webgpu-compute-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,QAAQ,EACR,eAAe,EAGhB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAO9C,4DAA4D;AAC5D,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,0BAA0B,CAAkC;gBAExD,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB;IAsB7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAoBvD,cAAc,CACZ,QAAQ,CAAC,EAAE,QAAQ,GAAG,eAAe,EACrC,kBAAkB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACnD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IASnC,yBAAyB,IAAI,eAAe;IAI5C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAGhE"}

package/dist/adapter/resources/webgpu-compute-pipeline.js

@@ -1,19 +1,15 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { ComputePipeline } from '@luma.gl/core';
-import { getBindGroup } from "../helpers/get-bind-group.js";
-const EMPTY_BINDINGS = {};
+import { ComputePipeline, _getDefaultBindGroupFactory, normalizeBindingsByGroup } from '@luma.gl/core';
+const EMPTY_BIND_GROUPS = {};
 // COMPUTE PIPELINE
 /** Creates a new compute pipeline when parameters change */
 export class WebGPUComputePipeline extends ComputePipeline {
     device;
     handle;
-    /** For internal use to create BindGroups */
-    _bindGroupLayout = null;
-    _bindGroup = null;
-    /** For internal use to create BindGroups */
-    _bindings;
+    _bindingsByGroup;
+    _bindGroupCacheKeysByGroup;
     constructor(device, props) {
         super(device, props);
         this.device = device;
@@ -29,38 +25,39 @@ export class WebGPUComputePipeline extends ComputePipeline {
                     },
                     layout: 'auto'
                 });
-        this._bindings = EMPTY_BINDINGS;
+        this._bindingsByGroup = EMPTY_BIND_GROUPS;
+        this._bindGroupCacheKeysByGroup = {};
     }
     /**
      * @todo Use renderpass.setBindings() ?
      * @todo Do we want to expose BindGroups in the API and remove this?
      */
     setBindings(bindings) {
-        let bindingsChanged = false;
-        for (const [name, binding] of Object.entries(bindings)) {
-            if (this._bindings[name] !== binding) {
-                if (!bindingsChanged) {
-                    if (this._bindings === EMPTY_BINDINGS) {
-                        this._bindings = {};
+        const nextBindingsByGroup = normalizeBindingsByGroup(this.shaderLayout, bindings);
+        for (const [groupKey, groupBindings] of Object.entries(nextBindingsByGroup)) {
+            const group = Number(groupKey);
+            for (const [name, binding] of Object.entries(groupBindings || {})) {
+                const currentGroupBindings = this._bindingsByGroup[group] || {};
+                if (currentGroupBindings[name] !== binding) {
+                    if (!this._bindingsByGroup[group] ||
+                        this._bindingsByGroup[group] === currentGroupBindings) {
+                        this._bindingsByGroup[group] = { ...currentGroupBindings };
                     }
-                    bindingsChanged = true;
+                    this._bindingsByGroup[group][name] = binding;
+                    this._bindGroupCacheKeysByGroup[group] = {};
                 }
-                this._bindings[name] = binding;
             }
         }
-        if (bindingsChanged) {
-            this._bindGroup = null;
-        }
     }
-    /** Return a bind group created by setBindings */
-    _getBindGroup() {
-        // Get hold of the bind group layout. We don't want to do this unless we know there is at least one bind group
-        this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);
-        // Set up the bindings
-        this._bindGroup =
-            this._bindGroup ||
-                getBindGroup(this.device, this._bindGroupLayout, this.shaderLayout, this._bindings);
-        return this._bindGroup;
+    _getBindGroups(bindings, bindGroupCacheKeys) {
+        const hasExplicitBindings = Boolean(bindings);
+        return _getDefaultBindGroupFactory(this.device).getBindGroups(this, hasExplicitBindings ? bindings : this._bindingsByGroup, hasExplicitBindings ? bindGroupCacheKeys : this._bindGroupCacheKeysByGroup);
+    }
+    _getBindingsByGroupWebGPU() {
+        return this._bindingsByGroup;
+    }
+    _getBindGroupCacheKeysWebGPU() {
+        return this._bindGroupCacheKeysByGroup;
     }
 }
 //# sourceMappingURL=webgpu-compute-pipeline.js.map

package/dist/adapter/resources/webgpu-compute-pipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-compute-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,eAAe,EAAgC,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAC,YAAY,EAAC,qCAAkC;AAIvD,MAAM,cAAc,GAA4B,EAAE,CAAC;AAEnD,mBAAmB;AAEnB,4DAA4D;AAC5D,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAC/C,MAAM,CAAe;IACrB,MAAM,CAAqB;IAEpC,4CAA4C;IACpC,gBAAgB,GAA8B,IAAI,CAAC;IACnD,UAAU,GAAwB,IAAI,CAAC;IAC/C,4CAA4C;IACpC,SAAS,CAA0B;IAE3C,YAAY,MAAoB,EAAE,KAA2B;QAC3D,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAsB,CAAC;QAEvD,IAAI,CAAC,MAAM;YACT,IAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBACvC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;oBACpB,OAAO,EAAE;wBACP,MAAM,EAAE,YAAY,CAAC,MAAM;wBAC3B,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;wBACjC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;qBAChC;oBACD,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC;QAEL,IAAI,CAAC,SAAS,GAAG,cAAc,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,QAAiC;QAC3C,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,IAAI,IAAI,CAAC,SAAS,KAAK,cAAc,EAAE,CAAC;wBACtC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;oBACtB,CAAC;oBACD,eAAe,GAAG,IAAI,CAAC;gBACzB,CAAC;gBACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;YACjC,CAAC;QACH,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,aAAa;QACX,8GAA8G;QAC9G,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEnF,sBAAsB;QACtB,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU;gBACf,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtF,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"webgpu-compute-pipeline.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-compute-pipeline.ts"],"names":[],"mappings":"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"}

package/dist/adapter/resources/webgpu-fence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-fence.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-fence.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,EAAE,KAAK,UAAU,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,6DAA6D;AAC7D,qBAAa,WAAY,SAAQ,KAAK;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAQ;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,UAAe;IAQxD,UAAU,IAAI,OAAO;IAIZ,OAAO,IAAI,IAAI;CAGzB"}
+{"version":3,"file":"webgpu-fence.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-fence.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,EAAE,KAAK,UAAU,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,6DAA6D;AAC7D,qBAAa,WAAY,SAAQ,KAAK;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAQ;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,UAAe;IAgBxD,UAAU,IAAI,OAAO;IAIZ,OAAO,IAAI,IAAI;CAGzB"}

package/dist/adapter/resources/webgpu-fence.js

@@ -11,8 +11,16 @@ export class WebGPUFence extends Fence {
     constructor(device, props = {}) {
         super(device, {});
         this.device = device;
-        this.signaled = device.handle.queue.onSubmittedWorkDone().then(() => {
+        this.signaled = device.handle.queue
+            .onSubmittedWorkDone()
+            .then(() => {
             this._signaled = true;
+        })
+            .catch(error => {
+            if (this.device.shouldIgnoreDroppedInstanceError(error)) {
+                return;
+            }
+            throw error;
         });
     }
     isSignaled() {

package/dist/adapter/resources/webgpu-fence.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-fence.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-fence.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,KAAK,EAAkB,MAAM,eAAe,CAAC;AAGrD,6DAA6D;AAC7D,MAAM,OAAO,WAAY,SAAQ,KAAK;IAC3B,MAAM,CAAe;IACrB,MAAM,GAAS,IAAI,CAAC;IACpB,QAAQ,CAAgB;IACzB,SAAS,GAAG,KAAK,CAAC;IAE1B,YAAY,MAAoB,EAAE,QAAoB,EAAE;QACtD,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAClE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEQ,OAAO;QACd,sCAAsC;IACxC,CAAC;CACF"}
+{"version":3,"file":"webgpu-fence.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-fence.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,KAAK,EAAkB,MAAM,eAAe,CAAC;AAGrD,6DAA6D;AAC7D,MAAM,OAAO,WAAY,SAAQ,KAAK;IAC3B,MAAM,CAAe;IACrB,MAAM,GAAS,IAAI,CAAC;IACpB,QAAQ,CAAgB;IACzB,SAAS,GAAG,KAAK,CAAC;IAE1B,YAAY,MAAoB,EAAE,QAAoB,EAAE;QACtD,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK;aAChC,mBAAmB,EAAE;aACrB,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC,CAAC;aACD,KAAK,CAAC,KAAK,CAAC,EAAE;YACb,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEQ,OAAO;QACd,sCAAsC;IACxC,CAAC;CACF"}

package/dist/adapter/resources/webgpu-pipeline-layout.d.ts

@@ -5,6 +5,6 @@ export declare class WebGPUPipelineLayout extends PipelineLayout {
     readonly handle: GPUPipelineLayout;
     constructor(device: WebGPUDevice, props: PipelineLayoutProps);
     destroy(): void;
-    protected mapShaderLayoutToBindGroupEntries(): GPUBindGroupLayoutEntry[];
+    protected mapShaderLayoutToBindGroupEntriesByGroup(): GPUBindGroupLayoutEntry[][];
 }
 //# sourceMappingURL=webgpu-pipeline-layout.d.ts.map

package/dist/adapter/resources/webgpu-pipeline-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-pipeline-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,cAAc,EACd,mBAAmB,EAGpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEvB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAqBnD,OAAO,IAAI,IAAI;IAMxB,SAAS,CAAC,iCAAiC,IAAI,uBAAuB,EAAE;CA+EzE"}
+{"version":3,"file":"webgpu-pipeline-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-pipeline-layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,cAAc,EACd,mBAAmB,EAGpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAE9C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEvB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAkBnD,OAAO,IAAI,IAAI;IAMxB,SAAS,CAAC,wCAAwC,IAAI,uBAAuB,EAAE,EAAE;CAoFlF"}

package/dist/adapter/resources/webgpu-pipeline-layout.js

@@ -8,18 +8,13 @@ export class WebGPUPipelineLayout extends PipelineLayout {
     constructor(device, props) {
         super(device, props);
         this.device = device;
-        const bindGroupEntries = this.mapShaderLayoutToBindGroupEntries();
+        const bindGroupEntriesByGroup = this.mapShaderLayoutToBindGroupEntriesByGroup();
         this.handle = this.device.handle.createPipelineLayout({
             label: props?.id ?? 'unnamed-pipeline-layout',
-            bindGroupLayouts: [
-                // TODO (kaapp): We can cache these to re-use them across
-                // layers, particularly if using a separate group for injected
-                // bindings (e.g. project/lighting)
-                this.device.handle.createBindGroupLayout({
-                    label: 'bind-group-layout',
-                    entries: bindGroupEntries
-                })
-            ]
+            bindGroupLayouts: bindGroupEntriesByGroup.map((entries, group) => this.device.handle.createBindGroupLayout({
+                label: `bind-group-layout-${group}`,
+                entries
+            }))
         });
     }
     destroy() {
@@ -27,10 +22,9 @@ export class WebGPUPipelineLayout extends PipelineLayout {
         // @ts-expect-error
         this.handle = null;
     }
-    mapShaderLayoutToBindGroupEntries() {
-        // Set up the pipeline layout
-        // TODO (kaapp): This only supports the first group, but so does the rest of the code
-        const bindGroupEntries = [];
+    mapShaderLayoutToBindGroupEntriesByGroup() {
+        const maxGroup = this.props.shaderLayout.bindings.reduce((highestGroup, binding) => Math.max(highestGroup, binding.group), -1);
+        const bindGroupEntriesByGroup = Array.from({ length: maxGroup + 1 }, () => []);
         for (const binding of this.props.shaderLayout.bindings) {
             const bindingTypeInfo = {};
             switch (binding.type) {
@@ -88,13 +82,13 @@ export class WebGPUPipelineLayout extends PipelineLayout {
                 }
             }
             const VISIBILITY_ALL = GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT | GPUShaderStage.COMPUTE;
-            bindGroupEntries.push({
+            bindGroupEntriesByGroup[binding.group].push({
                 binding: binding.location,
                 visibility: binding.visibility || VISIBILITY_ALL,
                 ...bindingTypeInfo
             });
         }
-        return bindGroupEntries;
+        return bindGroupEntriesByGroup;
     }
 }
 const isStorageTextureBindingLayout = (maybe) => {

package/dist/adapter/resources/webgpu-pipeline-layout.js.map

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

package/dist/adapter/resources/webgpu-render-pass.d.ts

@@ -1,4 +1,4 @@
-import type { RenderPassProps, RenderPassParameters, Binding } from '@luma.gl/core';
+import type { RenderPassProps, RenderPassParameters, Bindings, BindingsByGroup } from '@luma.gl/core';
 import { Buffer, RenderPass, RenderPipeline } from '@luma.gl/core';
 import { WebGPUDevice } from "../webgpu-device.js";
 import { WebGPURenderPipeline } from "./webgpu-render-pipeline.js";
@@ -10,13 +10,13 @@ export declare class WebGPURenderPass extends RenderPass {
     /** Active pipeline */
     pipeline: WebGPURenderPipeline | null;
     /** Latest bindings applied to this pass */
-    bindings: Record<string, Binding>;
-    constructor(device: WebGPUDevice, props?: RenderPassProps);
+    bindings: Bindings | BindingsByGroup;
+    constructor(device: WebGPUDevice, props?: RenderPassProps, commandEncoder?: GPUCommandEncoder);
     destroy(): void;
     end(): void;
     setPipeline(pipeline: RenderPipeline): void;
     /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
-    setBindings(bindings: Record<string, Binding>): void;
+    setBindings(bindings: Bindings | BindingsByGroup): void;
     setIndexBuffer(buffer: Buffer, indexFormat: GPUIndexFormat, offset?: number, size?: number): void;
     setVertexBuffer(slot: number, buffer: Buffer, offset?: number): void;
     draw(options: {

package/dist/adapter/resources/webgpu-render-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAM,MAAM,eAAe,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAGvD,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAExC,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE7C,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;gBAE3B,MAAM,EAAE,YAAY,EAAE,KAAK,GAAE,eAAoB;IA8EpD,OAAO,IAAI,IAAI;IAIxB,GAAG,IAAI,IAAI;IAQX,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAQpD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}
+{"version":3,"file":"webgpu-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,oBAAoB,EAAE,QAAQ,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AACpG,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAmC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAG9C,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAE9D,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAGvD,qBAAa,gBAAiB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAExC,sBAAsB;IACtB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE7C,2CAA2C;IAC3C,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAM;gBAGxC,MAAM,EAAE,YAAY,EACpB,KAAK,GAAE,eAAoB,EAC3B,cAAc,GAAE,iBAAgD;IA0EzD,OAAO,IAAI,IAAI;IAIxB,GAAG,IAAI,IAAI;IAQX,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAU3C,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAavD,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,MAAM,GAAE,MAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI;IAIP,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,GAAG,IAAI;IAIvE,IAAI,CAAC,OAAO,EAAE;QACZ,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAmBR,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAwBrD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAGxC,aAAa,IAAI,IAAI;IAGrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI5C,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAG7C,iBAAiB,IAAI,IAAI;IAQzB;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,GAAG,uBAAuB;CAqD3F"}

package/dist/adapter/resources/webgpu-render-pass.js

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { RenderPass, log } from '@luma.gl/core';
+import { RenderPass, _getDefaultBindGroupFactory, log } from '@luma.gl/core';
 import { getCpuHotspotProfiler, getTimestamp } from "../helpers/cpu-hotspot-profiler.js";
 export class WebGPURenderPass extends RenderPass {
     device;
@@ -11,7 +11,7 @@ export class WebGPURenderPass extends RenderPass {
     pipeline = null;
     /** Latest bindings applied to this pass */
     bindings = {};
-    constructor(device, props = {}) {
+    constructor(device, props = {}, commandEncoder = device.commandEncoder.handle) {
         super(device, props);
         this.device = device;
         const { props: renderPassProps } = this;
@@ -50,13 +50,9 @@ export class WebGPURenderPass extends RenderPass {
                     (profiler.renderPassDescriptorAssemblyTimeMs || 0) +
                         (getTimestamp() - descriptorAssemblyStartTime);
             }
-            if (!device.commandEncoder) {
-                throw new Error('commandEncoder not available');
-            }
             this.device.pushErrorScope('validation');
             const beginRenderPassStartTime = profiler ? getTimestamp() : 0;
-            this.handle =
-                this.props.handle || device.commandEncoder.handle.beginRenderPass(renderPassDescriptor);
+            this.handle = this.props.handle || commandEncoder.beginRenderPass(renderPassDescriptor);
             if (profiler) {
                 profiler.renderPassBeginCount = (profiler.renderPassBeginCount || 0) + 1;
                 profiler.renderPassBeginTimeMs =
@@ -101,9 +97,13 @@ export class WebGPURenderPass extends RenderPass {
     /** Sets an array of bindings (uniform buffers, samplers, textures, ...) */
     setBindings(bindings) {
         this.bindings = bindings;
-        const bindGroup = this.pipeline?._getBindGroup(bindings);
-        if (bindGroup) {
-            this.handle.setBindGroup(0, bindGroup);
+        const bindGroups = (this.pipeline &&
+            _getDefaultBindGroupFactory(this.device).getBindGroups(this.pipeline, bindings)) ||
+            {};
+        for (const [group, bindGroup] of Object.entries(bindGroups)) {
+            if (bindGroup) {
+                this.handle.setBindGroup(Number(group), bindGroup);
+            }
         }
     }
     setIndexBuffer(buffer, indexFormat, offset = 0, size) {

package/dist/adapter/resources/webgpu-render-pass.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webgpu-render-pass.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pass.ts"],"names":[],"mappings":"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"}

package/dist/adapter/resources/webgpu-render-pipeline.d.ts

@@ -1,4 +1,4 @@
-import type { Binding, RenderPass, VertexArray } from '@luma.gl/core';
+import type { Bindings, BindingsByGroup, RenderPass, VertexArray } from '@luma.gl/core';
 import { RenderPipeline, RenderPipelineProps } from '@luma.gl/core';
 import type { WebGPUDevice } from "../webgpu-device.js";
 import type { WebGPUShader } from "./webgpu-shader.js";
@@ -6,13 +6,12 @@ import type { WebGPUShader } from "./webgpu-shader.js";
 export declare class WebGPURenderPipeline extends RenderPipeline {
     readonly device: WebGPUDevice;
     readonly handle: GPURenderPipeline;
+    readonly descriptor: GPURenderPipelineDescriptor | null;
     readonly vs: WebGPUShader;
     readonly fs: WebGPUShader | null;
     /** Compatibility path for direct pipeline.setBindings() usage */
-    private _bindings;
-    /** For internal use to create BindGroups */
-    private _bindGroupLayout;
-    private _bindGroup;
+    private _bindingsByGroup;
+    private _bindGroupCacheKeysByGroup;
     get [Symbol.toStringTag](): string;
     constructor(device: WebGPUDevice, props: RenderPipelineProps);
     destroy(): void;
@@ -20,7 +19,7 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
      * Compatibility shim for code paths that still set bindings on the pipeline.
      * The shared-model path passes bindings per draw and does not rely on this state.
      */
-    setBindings(bindings: Record<string, Binding>): void;
+    setBindings(bindings: Bindings | BindingsByGroup): void;
     /** @todo - should this be moved to renderpass? */
     draw(options: {
         renderPass: RenderPass;
@@ -32,11 +31,13 @@ export declare class WebGPURenderPipeline extends RenderPipeline {
         firstIndex?: number;
         firstInstance?: number;
         baseVertex?: number;
-        bindings?: Record<string, Binding>;
+        bindings?: Bindings;
+        bindGroups?: BindingsByGroup;
+        _bindGroupCacheKeys?: Partial<Record<number, object>>;
         uniforms?: Record<string, unknown>;
     }): boolean;
-    /** Return a bind group created by setBindings */
-    _getBindGroup(bindings?: Record<string, Binding>): GPUBindGroup | null;
+    _getBindingsByGroupWebGPU(): BindingsByGroup;
+    _getBindGroupCacheKeysWebGPU(): Partial<Record<number, object>>;
     /**
      * Populate the complex WebGPU GPURenderPipelineDescriptor
      */

package/dist/adapter/resources/webgpu-render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAM,MAAM,eAAe,CAAC;AASvE,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAOlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,iEAAiE;IACjE,OAAO,CAAC,SAAS,CAA0B;IAC3C,4CAA4C;IAC5C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA6B;IAE/C,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAyBnD,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAkBpD,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,GAAG,OAAO;IA+CX,iDAAiD;IACjD,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmBhD;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAsDvC;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}
+{"version":3,"file":"webgpu-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-render-pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACtF,OAAO,EACL,cAAc,EACd,mBAAmB,EAIpB,MAAM,eAAe,CAAC;AAOvB,OAAO,KAAK,EAAC,YAAY,EAAC,4BAAyB;AAEnD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAKlD,2DAA2D;AAC3D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,iEAAiE;IACjE,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,0BAA0B,CAAuC;IAEzE,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,WAEhC;gBAEW,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAiCnD,OAAO,IAAI,IAAI;IAMxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAoBvD,kDAAkD;IAClD,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,GAAG,OAAO;IAsDX,yBAAyB,IAAI,eAAe;IAI5C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAI/D;;OAEG;IACH,SAAS,CAAC,4BAA4B;CAwDvC;AAaD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCE"}

package/dist/adapter/resources/webgpu-render-pipeline.js

@@ -1,31 +1,33 @@
 // luma.gl MIT license
-import { RenderPipeline, log } from '@luma.gl/core';
+import { RenderPipeline, _getDefaultBindGroupFactory, log, normalizeBindingsByGroup } from '@luma.gl/core';
 import { applyParametersToRenderPipelineDescriptor } from "../helpers/webgpu-parameters.js";
 import { getWebGPUTextureFormat } from "../helpers/convert-texture-format.js";
-import { getBindGroup } from "../helpers/get-bind-group.js";
 import { getVertexBufferLayout } from "../helpers/get-vertex-buffer-layout.js";
-const EMPTY_BINDINGS = {};
 // RENDER PIPELINE
 /** Creates a new render pipeline when parameters change */
 export class WebGPURenderPipeline extends RenderPipeline {
     device;
     handle;
+    descriptor;
     vs;
     fs = null;
     /** Compatibility path for direct pipeline.setBindings() usage */
-    _bindings;
-    /** For internal use to create BindGroups */
-    _bindGroupLayout = null;
-    _bindGroup = null;
+    _bindingsByGroup;
+    _bindGroupCacheKeysByGroup = {};
     get [Symbol.toStringTag]() {
         return 'WebGPURenderPipeline';
     }
     constructor(device, props) {
         super(device, props);
         this.device = device;
+        this.shaderLayout ||= this.device.getShaderLayout(props.vs.source) || {
+            attributes: [],
+            bindings: []
+        };
         this.handle = this.props.handle;
+        let descriptor = null;
         if (!this.handle) {
-            const descriptor = this._getRenderPipelineDescriptor();
+            descriptor = this._getRenderPipelineDescriptor();
             log.groupCollapsed(1, `new WebGPURenderPipeline(${this.id})`)();
             log.probe(1, JSON.stringify(descriptor, null, 2))();
             log.groupEnd(1)();
@@ -36,11 +38,14 @@ export class WebGPURenderPipeline extends RenderPipeline {
                 this.device.debug();
             });
         }
+        this.descriptor = descriptor;
         this.handle.label = this.props.id;
         // Note: Often the same shader in WebGPU
         this.vs = props.vs;
         this.fs = props.fs;
-        this._bindings = props.bindings || EMPTY_BINDINGS;
+        this._bindingsByGroup =
+            props.bindGroups || normalizeBindingsByGroup(this.shaderLayout, props.bindings);
+        this._bindGroupCacheKeysByGroup = createBindGroupCacheKeys(this._bindingsByGroup);
     }
     destroy() {
         // WebGPURenderPipeline has no destroy method.
@@ -52,21 +57,21 @@ export class WebGPURenderPipeline extends RenderPipeline {
      * The shared-model path passes bindings per draw and does not rely on this state.
      */
     setBindings(bindings) {
-        let bindingsChanged = false;
-        for (const [name, binding] of Object.entries(bindings)) {
-            if (this._bindings[name] !== binding) {
-                if (!bindingsChanged) {
-                    if (this._bindings === this.props.bindings || this._bindings === EMPTY_BINDINGS) {
-                        this._bindings = { ...this._bindings };
+        const nextBindingsByGroup = normalizeBindingsByGroup(this.shaderLayout, bindings);
+        for (const [groupKey, groupBindings] of Object.entries(nextBindingsByGroup)) {
+            const group = Number(groupKey);
+            for (const [name, binding] of Object.entries(groupBindings || {})) {
+                const currentGroupBindings = this._bindingsByGroup[group] || {};
+                if (currentGroupBindings[name] !== binding) {
+                    if (!this._bindingsByGroup[group] ||
+                        this._bindingsByGroup[group] === currentGroupBindings) {
+                        this._bindingsByGroup[group] = { ...currentGroupBindings };
                     }
-                    bindingsChanged = true;
+                    this._bindingsByGroup[group][name] = binding;
+                    this._bindGroupCacheKeysByGroup[group] = {};
                 }
-                this._bindings[name] = binding;
             }
         }
-        if (bindingsChanged) {
-            this._bindGroup = null;
-        }
     }
     /** @todo - should this be moved to renderpass? */
     draw(options) {
@@ -80,9 +85,12 @@ export class WebGPURenderPipeline extends RenderPipeline {
             this.device.debug();
         });
         // Set bindings (uniform buffers, textures etc)
-        const bindGroup = this._getBindGroup(options.bindings);
-        if (bindGroup) {
-            webgpuRenderPass.handle.setBindGroup(0, bindGroup);
+        const hasExplicitBindings = Boolean(options.bindGroups || options.bindings);
+        const bindGroups = _getDefaultBindGroupFactory(this.device).getBindGroups(this, hasExplicitBindings ? options.bindGroups || options.bindings : this._bindingsByGroup, hasExplicitBindings ? options._bindGroupCacheKeys : this._bindGroupCacheKeysByGroup);
+        for (const [group, bindGroup] of Object.entries(bindGroups)) {
+            if (bindGroup) {
+                webgpuRenderPass.handle.setBindGroup(Number(group), bindGroup);
+            }
         }
         // Set attributes
         // Note: Rebinds constant attributes before each draw call
@@ -98,20 +106,11 @@ export class WebGPURenderPipeline extends RenderPipeline {
         options.vertexArray.unbindAfterRender(options.renderPass);
         return true;
     }
-    /** Return a bind group created by setBindings */
-    _getBindGroup(bindings) {
-        if (this.shaderLayout.bindings.length === 0) {
-            return null;
-        }
-        // Get hold of the bind group layout. We don't want to do this unless we know there is at least one bind group
-        this._bindGroupLayout = this._bindGroupLayout || this.handle.getBindGroupLayout(0);
-        if (bindings) {
-            return getBindGroup(this.device, this._bindGroupLayout, this.shaderLayout, bindings);
-        }
-        this._bindGroup =
-            this._bindGroup ||
-                getBindGroup(this.device, this._bindGroupLayout, this.shaderLayout, this._bindings);
-        return this._bindGroup;
+    _getBindingsByGroupWebGPU() {
+        return this._bindingsByGroup;
+    }
+    _getBindGroupCacheKeysWebGPU() {
+        return this._bindGroupCacheKeysByGroup;
     }
     /**
      * Populate the complex WebGPU GPURenderPipelineDescriptor
@@ -121,7 +120,9 @@ export class WebGPURenderPipeline extends RenderPipeline {
         const vertex = {
             module: this.props.vs.handle,
             entryPoint: this.props.vertexEntryPoint || 'main',
-            buffers: getVertexBufferLayout(this.shaderLayout, this.props.bufferLayout)
+            buffers: getVertexBufferLayout(this.shaderLayout, this.props.bufferLayout, {
+                pipelineId: this.id
+            })
         };
         // Populate color targets
         // TODO - at the moment blend and write mask are only set on the first target
@@ -164,6 +165,15 @@ export class WebGPURenderPipeline extends RenderPipeline {
         return descriptor;
     }
 }
+function createBindGroupCacheKeys(bindingsByGroup) {
+    const bindGroupCacheKeys = {};
+    for (const [groupKey, groupBindings] of Object.entries(bindingsByGroup)) {
+        if (groupBindings && Object.keys(groupBindings).length > 0) {
+            bindGroupCacheKeys[Number(groupKey)] = {};
+        }
+    }
+    return bindGroupCacheKeys;
+}
 /**
 _setAttributeBuffers(webgpuRenderPass: WebGPURenderPass) {
   if (this._indexBuffer) {