@luma.gl/core 9.3.0-alpha.9 → 9.3.0

package/dist/index.d.ts

@@ -45,7 +45,8 @@ export { QuerySet } from "./adapter/resources/query-set.js";
 export { Fence, type FenceProps } from "./adapter/resources/fence.js";
 export type { PipelineLayoutProps } from "./adapter/resources/pipeline-layout.js";
 export { PipelineLayout } from "./adapter/resources/pipeline-layout.js";
-export { UniformBufferLayout } from "./portable/uniform-buffer-layout.js";
+export { makeShaderBlockLayout, type ShaderBlockLayout, type ShaderBlockLayoutEntry, type ShaderBlockLayoutOptions } from "./shadertypes/shader-types/shader-block-layout.js";
+export { ShaderBlockWriter } from "./portable/shader-block-writer.js";
 export { UniformBlock } from "./portable/uniform-block.js";
 export { UniformStore } from "./portable/uniform-store.js";
 export type { CompilerMessage } from "./adapter/types/compiler-message.js";

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -32,7 +32,8 @@ export { QuerySet } from "./adapter/resources/query-set.js";
 export { Fence } from "./adapter/resources/fence.js";
 export { PipelineLayout } from "./adapter/resources/pipeline-layout.js";
 // PORTABLE API - UNIFORM BUFFERS
-export { UniformBufferLayout } from "./portable/uniform-buffer-layout.js";
+export { makeShaderBlockLayout } from "./shadertypes/shader-types/shader-block-layout.js";
+export { ShaderBlockWriter } from "./portable/shader-block-writer.js";
 export { UniformBlock } from "./portable/uniform-block.js";
 export { UniformStore } from "./portable/uniform-store.js";
 export { dataTypeDecoder } from "./shadertypes/data-types/data-type-decoder.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,IAAI,EAAC,0BAAuB;AAEpC,+CAA+C;AAC/C,OAAO,EAAC,OAAO,EAAC,6BAA0B;AAQ1C,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAC,4BAAyB;AAGtE,OAAO,EAAC,aAAa,EAAC,oCAAiC;AAEvD,OAAO,EAAC,mBAAmB,EAAC,0CAAuC;AAEnE,gBAAgB;AAChB,OAAO,EAAC,QAAQ,EAAqB,wCAAqC;AAE1E,OAAO,EAAC,MAAM,EAA2C,sCAAmC;AAE5F,OAAO,EAAC,OAAO,EAAoB,uCAAoC;AAEvE,OAAO,EAAC,WAAW,EAAwB,4CAAyC;AAGpF,OAAO,EAAC,eAAe,EAAC,gDAA6C;AAGrE,OAAO,EAAC,MAAM,EAAC,sCAAmC;AAGlD,OAAO,EAAC,OAAO,EAAC,uCAAoC;AAGpD,OAAO,EAAC,WAAW,EAAC,2CAAwC;AAG5D,OAAO,EAAC,cAAc,EAAC,+CAA4C;AACnE,OAAO,EACL,oBAAoB,EAErB,sDAAmD;AAEpD,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,OAAO,EAAC,aAAa,EAAC,sCAAmC;AACzD,OAAO,EAAC,2BAA2B,EAAC,0CAAuC;AAG3E,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAG3D,OAAO,EAAC,eAAe,EAAC,gDAA6C;AAGrE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAG7D,OAAO,EAAC,cAAc,EAAC,+CAA4C;AAGnE,OAAO,EAAC,aAAa,EAAC,8CAA2C;AAGjE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAG7D,OAAO,EAAC,iBAAiB,EAAC,kDAA+C;AAGzE,OAAO,EAAC,QAAQ,EAAC,yCAAsC;AAEvD,OAAO,EAAC,KAAK,EAAkB,qCAAkC;AAGjE,OAAO,EAAC,cAAc,EAAC,+CAA4C;AAEnE,iCAAiC;AACjC,OAAO,EAAC,mBAAmB,EAAC,4CAAyC;AACrE,OAAO,EAAC,YAAY,EAAC,oCAAiC;AACtD,OAAO,EAAC,YAAY,EAAC,oCAAiC;AAwFtD,OAAO,EAAC,eAAe,EAAC,sDAAmD;AAC3E,OAAO,EAAC,wBAAwB,EAAC,sDAAmD;AAWpF,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,yBAAyB,EAE1B,0DAAuD;AASxD,OAAO,EAAC,mBAAmB,EAAC,4DAAyD;AAgBrF,OAAO,EAEL,oBAAoB,EACrB,8DAA2D;AAE5D,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,sDAAmD;AACpG,OAAO,EAAiB,SAAS,EAAE,UAAU,EAAC,mDAAgD;AAE9F,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,iDAA8C;AAe5F,yDAAyD;AACzD,OAAO,EAAC,GAAG,EAAC,uBAAoB;AAChC,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACvB,uCAAoC;AACrC,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,0BAAuB;AACrD,OAAO,EAAC,eAAe,EAAC,oCAAiC;AAEzD,OAAO,EAAC,4BAA4B,EAAC,sDAAmD;AAExF,eAAe;AACf,OAAO,EACL,0BAA0B,IAAI,2BAA2B,EACzD,qBAAqB,IAAI,sBAAsB,EAChD,4DAAyD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,IAAI,EAAC,0BAAuB;AAEpC,+CAA+C;AAC/C,OAAO,EAAC,OAAO,EAAC,6BAA0B;AAQ1C,OAAO,EAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAC,4BAAyB;AAGtE,OAAO,EAAC,aAAa,EAAC,oCAAiC;AAEvD,OAAO,EAAC,mBAAmB,EAAC,0CAAuC;AAEnE,gBAAgB;AAChB,OAAO,EAAC,QAAQ,EAAqB,wCAAqC;AAE1E,OAAO,EAAC,MAAM,EAA2C,sCAAmC;AAE5F,OAAO,EAAC,OAAO,EAAoB,uCAAoC;AAEvE,OAAO,EAAC,WAAW,EAAwB,4CAAyC;AAGpF,OAAO,EAAC,eAAe,EAAC,gDAA6C;AAGrE,OAAO,EAAC,MAAM,EAAC,sCAAmC;AAGlD,OAAO,EAAC,OAAO,EAAC,uCAAoC;AAGpD,OAAO,EAAC,WAAW,EAAC,2CAAwC;AAG5D,OAAO,EAAC,cAAc,EAAC,+CAA4C;AACnE,OAAO,EACL,oBAAoB,EAErB,sDAAmD;AAEpD,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,OAAO,EAAC,aAAa,EAAC,sCAAmC;AACzD,OAAO,EAAC,2BAA2B,EAAC,0CAAuC;AAG3E,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAG3D,OAAO,EAAC,eAAe,EAAC,gDAA6C;AAGrE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAG7D,OAAO,EAAC,cAAc,EAAC,+CAA4C;AAGnE,OAAO,EAAC,aAAa,EAAC,8CAA2C;AAGjE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAG7D,OAAO,EAAC,iBAAiB,EAAC,kDAA+C;AAGzE,OAAO,EAAC,QAAQ,EAAC,yCAAsC;AAEvD,OAAO,EAAC,KAAK,EAAkB,qCAAkC;AAGjE,OAAO,EAAC,cAAc,EAAC,+CAA4C;AAEnE,iCAAiC;AACjC,OAAO,EACL,qBAAqB,EAItB,0DAAuD;AACxD,OAAO,EAAC,iBAAiB,EAAC,0CAAuC;AACjE,OAAO,EAAC,YAAY,EAAC,oCAAiC;AACtD,OAAO,EAAC,YAAY,EAAC,oCAAiC;AAwFtD,OAAO,EAAC,eAAe,EAAC,sDAAmD;AAC3E,OAAO,EAAC,wBAAwB,EAAC,sDAAmD;AAWpF,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,yBAAyB,EAE1B,0DAAuD;AASxD,OAAO,EAAC,mBAAmB,EAAC,4DAAyD;AAgBrF,OAAO,EAEL,oBAAoB,EACrB,8DAA2D;AAE5D,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,sDAAmD;AACpG,OAAO,EAAiB,SAAS,EAAE,UAAU,EAAC,mDAAgD;AAE9F,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,iDAA8C;AAe5F,yDAAyD;AACzD,OAAO,EAAC,GAAG,EAAC,uBAAoB;AAChC,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACvB,uCAAoC;AACrC,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,0BAAuB;AACrD,OAAO,EAAC,eAAe,EAAC,oCAAiC;AAEzD,OAAO,EAAC,4BAA4B,EAAC,sDAAmD;AAExF,eAAe;AACf,OAAO,EACL,0BAA0B,IAAI,2BAA2B,EACzD,qBAAqB,IAAI,sBAAsB,EAChD,4DAAyD"}

package/dist/portable/shader-block-writer.d.ts

@@ -0,0 +1,51 @@
+import type { CompositeUniformValue, UniformValue } from "../adapter/types/uniforms.js";
+import { type ShaderBlockLayout } from "../shadertypes/shader-types/shader-block-layout.js";
+/**
+ * Serializes nested JavaScript uniform values according to a {@link ShaderBlockLayout}.
+ */
+export declare class ShaderBlockWriter {
+    /** Layout metadata used to flatten and serialize values. */
+    readonly layout: ShaderBlockLayout;
+    /**
+     * Creates a writer for a precomputed shader-block layout.
+     */
+    constructor(layout: ShaderBlockLayout);
+    /**
+     * Returns `true` if the flattened layout contains the given field.
+     */
+    has(name: string): boolean;
+    /**
+     * Returns offset and size metadata for a flattened field.
+     */
+    get(name: string): {
+        offset: number;
+        size: number;
+    } | undefined;
+    /**
+     * Flattens nested composite values into leaf-path values understood by {@link UniformBlock}.
+     *
+     * Top-level values may be supplied either in nested object form matching the
+     * declared composite shader types or as already-flattened leaf-path values.
+     */
+    getFlatUniformValues(uniformValues: Readonly<Record<string, CompositeUniformValue>>): Record<string, UniformValue>;
+    /**
+     * Serializes the supplied values into buffer-backed binary data.
+     *
+     * The returned view length matches {@link ShaderBlockLayout.byteLength}, which
+     * is the exact packed size of the block.
+     */
+    getData(uniformValues: Readonly<Record<string, CompositeUniformValue>>): Uint8Array;
+    /**
+     * Recursively flattens nested values using the declared composite shader type.
+     */
+    private _flattenCompositeValue;
+    /**
+     * Expands tightly packed numeric arrays into per-element leaf fields.
+     */
+    private _flattenPackedArray;
+    /**
+     * Writes one flattened leaf value into its typed-array view.
+     */
+    private _writeLeafValue;
+}
+//# sourceMappingURL=shader-block-writer.d.ts.map

package/dist/portable/shader-block-writer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-block-writer.d.ts","sourceRoot":"","sources":["../../src/portable/shader-block-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,qBAAqB,EAAE,YAAY,EAAC,qCAAkC;AAQnF,OAAO,EAGL,KAAK,iBAAiB,EACvB,2DAAwD;AAEzD;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,4DAA4D;IAC5D,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC;;OAEG;gBACS,MAAM,EAAE,iBAAiB;IAIrC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,SAAS;IAK7D;;;;;OAKG;IACH,oBAAoB,CAClB,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,GAC7D,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAe/B;;;;;OAKG;IACH,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,GAAG,UAAU;IAkBnF;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAgE9B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA6B3B;;OAEG;IACH,OAAO,CAAC,eAAe;CAoCxB"}

package/dist/portable/shader-block-writer.js

@@ -0,0 +1,185 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { getScratchArrayBuffer } from "../utils/array-utils-flat.js";
+import { isNumberArray } from "../utils/is-array.js";
+import { log } from "../utils/log.js";
+import { getLeafLayoutInfo, isCompositeShaderTypeStruct } from "../shadertypes/shader-types/shader-block-layout.js";
+/**
+ * Serializes nested JavaScript uniform values according to a {@link ShaderBlockLayout}.
+ */
+export class ShaderBlockWriter {
+    /** Layout metadata used to flatten and serialize values. */
+    layout;
+    /**
+     * Creates a writer for a precomputed shader-block layout.
+     */
+    constructor(layout) {
+        this.layout = layout;
+    }
+    /**
+     * Returns `true` if the flattened layout contains the given field.
+     */
+    has(name) {
+        return Boolean(this.layout.fields[name]);
+    }
+    /**
+     * Returns offset and size metadata for a flattened field.
+     */
+    get(name) {
+        const entry = this.layout.fields[name];
+        return entry ? { offset: entry.offset, size: entry.size } : undefined;
+    }
+    /**
+     * Flattens nested composite values into leaf-path values understood by {@link UniformBlock}.
+     *
+     * Top-level values may be supplied either in nested object form matching the
+     * declared composite shader types or as already-flattened leaf-path values.
+     */
+    getFlatUniformValues(uniformValues) {
+        const flattenedUniformValues = {};
+        for (const [name, value] of Object.entries(uniformValues)) {
+            const uniformType = this.layout.uniformTypes[name];
+            if (uniformType) {
+                this._flattenCompositeValue(flattenedUniformValues, name, uniformType, value);
+            }
+            else if (this.layout.fields[name]) {
+                flattenedUniformValues[name] = value;
+            }
+        }
+        return flattenedUniformValues;
+    }
+    /**
+     * Serializes the supplied values into buffer-backed binary data.
+     *
+     * The returned view length matches {@link ShaderBlockLayout.byteLength}, which
+     * is the exact packed size of the block.
+     */
+    getData(uniformValues) {
+        const buffer = getScratchArrayBuffer(this.layout.byteLength);
+        new Uint8Array(buffer, 0, this.layout.byteLength).fill(0);
+        const typedArrays = {
+            i32: new Int32Array(buffer),
+            u32: new Uint32Array(buffer),
+            f32: new Float32Array(buffer),
+            f16: new Uint16Array(buffer)
+        };
+        const flattenedUniformValues = this.getFlatUniformValues(uniformValues);
+        for (const [name, value] of Object.entries(flattenedUniformValues)) {
+            this._writeLeafValue(typedArrays, name, value);
+        }
+        return new Uint8Array(buffer, 0, this.layout.byteLength);
+    }
+    /**
+     * Recursively flattens nested values using the declared composite shader type.
+     */
+    _flattenCompositeValue(flattenedUniformValues, baseName, uniformType, value) {
+        if (value === undefined) {
+            return;
+        }
+        if (typeof uniformType === 'string' || this.layout.fields[baseName]) {
+            flattenedUniformValues[baseName] = value;
+            return;
+        }
+        if (Array.isArray(uniformType)) {
+            const elementType = uniformType[0];
+            const length = uniformType[1];
+            if (Array.isArray(elementType)) {
+                throw new Error(`Nested arrays are not supported for ${baseName}`);
+            }
+            if (typeof elementType === 'string' && isNumberArray(value)) {
+                this._flattenPackedArray(flattenedUniformValues, baseName, elementType, length, value);
+                return;
+            }
+            if (!Array.isArray(value)) {
+                log.warn(`Unsupported uniform array value for ${baseName}:`, value)();
+                return;
+            }
+            for (let index = 0; index < Math.min(value.length, length); index++) {
+                const elementValue = value[index];
+                if (elementValue === undefined) {
+                    continue;
+                }
+                this._flattenCompositeValue(flattenedUniformValues, `${baseName}[${index}]`, elementType, elementValue);
+            }
+            return;
+        }
+        if (isCompositeShaderTypeStruct(uniformType) && isCompositeUniformObject(value)) {
+            for (const [key, subValue] of Object.entries(value)) {
+                if (subValue === undefined) {
+                    continue;
+                }
+                const nestedName = `${baseName}.${key}`;
+                this._flattenCompositeValue(flattenedUniformValues, nestedName, uniformType[key], subValue);
+            }
+            return;
+        }
+        log.warn(`Unsupported uniform value for ${baseName}:`, value)();
+    }
+    /**
+     * Expands tightly packed numeric arrays into per-element leaf fields.
+     */
+    _flattenPackedArray(flattenedUniformValues, baseName, elementType, length, value) {
+        const numericValue = value;
+        const elementLayout = getLeafLayoutInfo(elementType, this.layout.layout);
+        const packedElementLength = elementLayout.components;
+        for (let index = 0; index < length; index++) {
+            const start = index * packedElementLength;
+            if (start >= numericValue.length) {
+                break;
+            }
+            if (packedElementLength === 1) {
+                flattenedUniformValues[`${baseName}[${index}]`] = Number(numericValue[start]);
+            }
+            else {
+                flattenedUniformValues[`${baseName}[${index}]`] = sliceNumericArray(value, start, start + packedElementLength);
+            }
+        }
+    }
+    /**
+     * Writes one flattened leaf value into its typed-array view.
+     */
+    _writeLeafValue(typedArrays, name, value) {
+        const entry = this.layout.fields[name];
+        if (!entry) {
+            log.warn(`Uniform ${name} not found in layout`)();
+            return;
+        }
+        const { type, components, columns, rows, offset, columnStride } = entry;
+        const array = typedArrays[type];
+        if (components === 1) {
+            array[offset] = Number(value);
+            return;
+        }
+        const sourceValue = value;
+        if (columns === 1) {
+            for (let componentIndex = 0; componentIndex < components; componentIndex++) {
+                array[offset + componentIndex] = Number(sourceValue[componentIndex] ?? 0);
+            }
+            return;
+        }
+        let sourceIndex = 0;
+        for (let columnIndex = 0; columnIndex < columns; columnIndex++) {
+            const columnOffset = offset + columnIndex * columnStride;
+            for (let rowIndex = 0; rowIndex < rows; rowIndex++) {
+                array[columnOffset + rowIndex] = Number(sourceValue[sourceIndex++] ?? 0);
+            }
+        }
+    }
+}
+/**
+ * Type guard for nested uniform objects.
+ */
+function isCompositeUniformObject(value) {
+    return (Boolean(value) &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        !ArrayBuffer.isView(value));
+}
+/**
+ * Slices a numeric array-like value without changing its numeric representation.
+ */
+function sliceNumericArray(value, start, end) {
+    return Array.prototype.slice.call(value, start, end);
+}
+//# sourceMappingURL=shader-block-writer.js.map

package/dist/portable/shader-block-writer.js.map

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

package/dist/portable/uniform-store.d.ts

@@ -2,8 +2,22 @@ import type { CompositeShaderType } from "../shadertypes/shader-types/shader-typ
 import type { CompositeUniformValue } from "../adapter/types/uniforms.js";
 import type { Device } from "../adapter/device.js";
 import { Buffer } from "../adapter/resources/buffer.js";
+import { type ShaderBlockLayout } from "../shadertypes/shader-types/shader-block-layout.js";
 import { UniformBlock } from "./uniform-block.js";
-import { UniformBufferLayout } from "./uniform-buffer-layout.js";
+import { ShaderBlockWriter } from "./shader-block-writer.js";
+/** Definition of a single managed uniform block. */
+export type UniformStoreBlockDefinition = {
+    /** Declared shader types for the block's uniforms. */
+    uniformTypes?: Record<string, CompositeShaderType>;
+    /** Reserved for future prop-level defaults. */
+    defaultProps?: Record<string, unknown>;
+    /** Initial uniform values written into the backing block. */
+    defaultUniforms?: Record<string, CompositeUniformValue>;
+    /** Explicit shader-block layout override. */
+    layout?: 'std140' | 'wgsl-uniform' | 'wgsl-storage';
+};
+/** Uniform block definitions keyed by block name. */
+export type UniformStoreBlocks<TPropGroups extends Record<string, Record<string, unknown>>> = Record<keyof TPropGroups, UniformStoreBlockDefinition>;
 /**
  * A uniform store holds a uniform values for one or more uniform blocks,
  * - It can generate binary data for any uniform buffer
@@ -12,46 +26,64 @@ import { UniformBufferLayout } from "./uniform-buffer-layout.js";
  * - It performs some book keeping on what has changed to minimize unnecessary writes to uniform buffers.
  */
 export declare class UniformStore<TPropGroups extends Record<string, Record<string, unknown>> = Record<string, Record<string, unknown>>> {
+    /** Device used to infer layout and allocate buffers. */
+    readonly device: Device;
     /** Stores the uniform values for each uniform block */
     uniformBlocks: Map<keyof TPropGroups, UniformBlock<Record<string, import("../adapter/types/uniforms").UniformValue>>>;
-    /** Can generate data for a uniform buffer for each block from data */
-    uniformBufferLayouts: Map<keyof TPropGroups, UniformBufferLayout>;
+    /** Flattened layout metadata for each block. */
+    shaderBlockLayouts: Map<keyof TPropGroups, ShaderBlockLayout>;
+    /** Serializers for block-backed uniform data. */
+    shaderBlockWriters: Map<keyof TPropGroups, ShaderBlockWriter>;
     /** Actual buffer for the blocks */
     uniformBuffers: Map<keyof TPropGroups, Buffer>;
     /**
-     * Create a new UniformStore instance
-     * @param blocks
+     * Creates a new {@link UniformStore} for the supplied device and block definitions.
      */
-    constructor(blocks: Record<keyof TPropGroups, {
-        uniformTypes?: Record<string, CompositeShaderType>;
-        defaultProps?: Record<string, unknown>;
-        defaultUniforms?: Record<string, CompositeUniformValue>;
-    }>);
+    constructor(device: Device, blocks: UniformStoreBlocks<TPropGroups>);
     /** Destroy any managed uniform buffers */
     destroy(): void;
     /**
      * Set uniforms
-     * Makes all properties partial
+     *
+     * Makes all group properties partial and eagerly propagates changes to any
+     * managed GPU buffers.
      */
     setUniforms(uniforms: Partial<{
         [group in keyof TPropGroups]: Partial<TPropGroups[group]>;
     }>): void;
-    /** Get the required minimum length of the uniform buffer */
+    /**
+     * Returns the allocation size for the named uniform buffer.
+     *
+     * This may exceed the packed layout size because minimum buffer-size policy is
+     * applied at the store layer.
+     */
     getUniformBufferByteLength(uniformBufferName: keyof TPropGroups): number;
-    /** Get formatted binary memory that can be uploaded to a buffer */
+    /**
+     * Returns packed binary data that can be uploaded to the named uniform buffer.
+     *
+     * The returned view length matches the packed block size and is not padded to
+     * the store's minimum allocation size.
+     */
     getUniformBufferData(uniformBufferName: keyof TPropGroups): Uint8Array;
     /**
-     * Creates an unmanaged uniform buffer (umnanaged means that application is responsible for destroying it)
-     * The new buffer is initialized with current / supplied values
+     * Creates an unmanaged uniform buffer initialized with the current or supplied values.
      */
-    createUniformBuffer(device: Device, uniformBufferName: keyof TPropGroups, uniforms?: Partial<{
+    createUniformBuffer(uniformBufferName: keyof TPropGroups, uniforms?: Partial<{
         [group in keyof TPropGroups]: Partial<TPropGroups[group]>;
     }>): Buffer;
-    /** Get the managed uniform buffer. "managed" resources are destroyed when the uniformStore is destroyed. */
-    getManagedUniformBuffer(device: Device, uniformBufferName: keyof TPropGroups): Buffer;
-    /** Updates all uniform buffers where values have changed */
+    /** Returns the managed uniform buffer for the named block. */
+    getManagedUniformBuffer(uniformBufferName: keyof TPropGroups): Buffer;
+    /**
+     * Updates every managed uniform buffer whose source uniforms have changed.
+     *
+     * @returns The first redraw reason encountered, or `false` if nothing changed.
+     */
     updateUniformBuffers(): false | string;
-    /** Update one uniform buffer. Only updates if values have changed */
+    /**
+     * Updates one managed uniform buffer if its corresponding block is dirty.
+     *
+     * @returns The redraw reason for the update, or `false` if no write occurred.
+     */
     updateUniformBuffer(uniformBufferName: keyof TPropGroups): false | string;
 }
 //# sourceMappingURL=uniform-store.d.ts.map

package/dist/portable/uniform-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniform-store.d.ts","sourceRoot":"","sources":["../../src/portable/uniform-store.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAC,oDAAiD;AAClF,OAAO,KAAK,EAAC,qBAAqB,EAAC,qCAAkC;AACrE,OAAO,KAAK,EAAC,MAAM,EAAC,6BAA0B;AAC9C,OAAO,EAAC,MAAM,EAAC,uCAAoC;AAEnD,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,mBAAmB,EAAC,mCAAgC;AAE5D;;;;;;GAMG;AACH,qBAAa,YAAY,CACvB,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAClE,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACxB;IAED,uDAAuD;IACvD,aAAa,yGAA8C;IAC3D,sEAAsE;IACtE,oBAAoB,8CAAqD;IACzE,mCAAmC;IACnC,cAAc,iCAAwC;IAEtD;;;OAGG;gBAED,MAAM,EAAE,MAAM,CACZ,MAAM,WAAW,EACjB;QACE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QACnD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;KACzD,CACF;IAkBH,0CAA0C;IAC1C,OAAO,IAAI,IAAI;IAMf;;;OAGG;IACH,WAAW,CACT,QAAQ,EAAE,OAAO,CAAC;SAAE,KAAK,IAAI,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAAC,CAAC,GAC7E,IAAI;IAeP,4DAA4D;IAC5D,0BAA0B,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,MAAM;IAIxE,mEAAmE;IACnE,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,UAAU;IAMtE;;;OAGG;IACH,mBAAmB,CACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,WAAW,EACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;SAAE,KAAK,IAAI,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAAC,CAAC,GAC9E,MAAM;IAeT,4GAA4G;IAC5G,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,WAAW,GAAG,MAAM;IAcrF,4DAA4D;IAC5D,oBAAoB,IAAI,KAAK,GAAG,MAAM;IAYtC,qEAAqE;IACrE,mBAAmB,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM;CAwB1E"}
+{"version":3,"file":"uniform-store.d.ts","sourceRoot":"","sources":["../../src/portable/uniform-store.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAC,oDAAiD;AAClF,OAAO,KAAK,EAAC,qBAAqB,EAAC,qCAAkC;AACrE,OAAO,KAAK,EAAC,MAAM,EAAC,6BAA0B;AAC9C,OAAO,EAAC,MAAM,EAAC,uCAAoC;AAEnD,OAAO,EAEL,KAAK,iBAAiB,EACvB,2DAAwD;AACzD,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,iBAAiB,EAAC,iCAA8B;AAExD,oDAAoD;AACpD,MAAM,MAAM,2BAA2B,GAAG;IACxC,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACnD,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,6DAA6D;IAC7D,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACxD,6CAA6C;IAC7C,MAAM,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,cAAc,CAAC;CACrD,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,kBAAkB,CAAC,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IACxF,MAAM,CAAC,MAAM,WAAW,EAAE,2BAA2B,CAAC,CAAC;AAazD;;;;;;GAMG;AACH,qBAAa,YAAY,CACvB,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAClE,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACxB;IAED,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,aAAa,yGAA8C;IAC3D,gDAAgD;IAChD,kBAAkB,4CAAmD;IACrE,iDAAiD;IACjD,kBAAkB,4CAAmD;IACrE,mCAAmC;IACnC,cAAc,iCAAwC;IAEtD;;OAEG;gBACS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,CAAC,WAAW,CAAC;IAqBnE,0CAA0C;IAC1C,OAAO,IAAI,IAAI;IAMf;;;;;OAKG;IACH,WAAW,CACT,QAAQ,EAAE,OAAO,CAAC;SAAE,KAAK,IAAI,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAAC,CAAC,GAC7E,IAAI;IAeP;;;;;OAKG;IACH,0BAA0B,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,MAAM;IAKxE;;;;;OAKG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,UAAU;IAMtE;;OAEG;IACH,mBAAmB,CACjB,iBAAiB,EAAE,MAAM,WAAW,EACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;SAAE,KAAK,IAAI,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAAC,CAAC,GAC9E,MAAM;IAeT,8DAA8D;IAC9D,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,MAAM;IAcrE;;;;OAIG;IACH,oBAAoB,IAAI,KAAK,GAAG,MAAM;IAYtC;;;;OAIG;IACH,mBAAmB,CAAC,iBAAiB,EAAE,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM;CAwB1E"}

package/dist/portable/uniform-store.js

@@ -3,8 +3,19 @@
 // Copyright (c) vis.gl contributors
 import { Buffer } from "../adapter/resources/buffer.js";
 import { log } from "../utils/log.js";
+import { makeShaderBlockLayout } from "../shadertypes/shader-types/shader-block-layout.js";
 import { UniformBlock } from "./uniform-block.js";
-import { UniformBufferLayout } from "./uniform-buffer-layout.js";
+import { ShaderBlockWriter } from "./shader-block-writer.js";
+/**
+ * Smallest buffer size that can be used for uniform buffers.
+ *
+ * This is an allocation policy rather than part of {@link ShaderBlockLayout}.
+ * Layouts report the exact packed size, while the store applies any minimum
+ * buffer-size rule when allocating GPU buffers.
+ *
+ * TODO - does this depend on device?
+ */
+const minUniformBufferSize = 1024;
 /**
  * A uniform store holds a uniform values for one or more uniform blocks,
  * - It can generate binary data for any uniform buffer
@@ -13,25 +24,33 @@ import { UniformBufferLayout } from "./uniform-buffer-layout.js";
  * - It performs some book keeping on what has changed to minimize unnecessary writes to uniform buffers.
  */
 export class UniformStore {
+    /** Device used to infer layout and allocate buffers. */
+    device;
     /** Stores the uniform values for each uniform block */
     uniformBlocks = new Map();
-    /** Can generate data for a uniform buffer for each block from data */
-    uniformBufferLayouts = new Map();
+    /** Flattened layout metadata for each block. */
+    shaderBlockLayouts = new Map();
+    /** Serializers for block-backed uniform data. */
+    shaderBlockWriters = new Map();
     /** Actual buffer for the blocks */
     uniformBuffers = new Map();
     /**
-     * Create a new UniformStore instance
-     * @param blocks
+     * Creates a new {@link UniformStore} for the supplied device and block definitions.
      */
-    constructor(blocks) {
+    constructor(device, blocks) {
+        this.device = device;
         for (const [bufferName, block] of Object.entries(blocks)) {
             const uniformBufferName = bufferName;
             // Create a layout object to help us generate correctly formatted binary uniform buffers
-            const uniformBufferLayout = new UniformBufferLayout(block.uniformTypes ?? {});
-            this.uniformBufferLayouts.set(uniformBufferName, uniformBufferLayout);
+            const shaderBlockLayout = makeShaderBlockLayout(block.uniformTypes ?? {}, {
+                layout: block.layout ?? getDefaultUniformBufferLayout(device)
+            });
+            const shaderBlockWriter = new ShaderBlockWriter(shaderBlockLayout);
+            this.shaderBlockLayouts.set(uniformBufferName, shaderBlockLayout);
+            this.shaderBlockWriters.set(uniformBufferName, shaderBlockWriter);
             // Create a Uniform block to store the uniforms for each buffer.
             const uniformBlock = new UniformBlock({ name: bufferName });
-            uniformBlock.setUniforms(uniformBufferLayout.getFlatUniformValues(block.defaultUniforms || {}));
+            uniformBlock.setUniforms(shaderBlockWriter.getFlatUniformValues(block.defaultUniforms || {}));
             this.uniformBlocks.set(uniformBufferName, uniformBlock);
         }
     }
@@ -43,39 +62,51 @@ export class UniformStore {
     }
     /**
      * Set uniforms
-     * Makes all properties partial
+     *
+     * Makes all group properties partial and eagerly propagates changes to any
+     * managed GPU buffers.
      */
     setUniforms(uniforms) {
         for (const [blockName, uniformValues] of Object.entries(uniforms)) {
             const uniformBufferName = blockName;
-            const uniformBufferLayout = this.uniformBufferLayouts.get(uniformBufferName);
-            const flattenedUniforms = uniformBufferLayout?.getFlatUniformValues((uniformValues || {}));
+            const shaderBlockWriter = this.shaderBlockWriters.get(uniformBufferName);
+            const flattenedUniforms = shaderBlockWriter?.getFlatUniformValues((uniformValues || {}));
             this.uniformBlocks.get(uniformBufferName)?.setUniforms(flattenedUniforms || {});
             // We leverage logging in updateUniformBuffers(), even though slightly less efficient
             // this.updateUniformBuffer(blockName);
         }
         this.updateUniformBuffers();
     }
-    /** Get the required minimum length of the uniform buffer */
+    /**
+     * Returns the allocation size for the named uniform buffer.
+     *
+     * This may exceed the packed layout size because minimum buffer-size policy is
+     * applied at the store layer.
+     */
     getUniformBufferByteLength(uniformBufferName) {
-        return this.uniformBufferLayouts.get(uniformBufferName)?.byteLength || 0;
+        const packedByteLength = this.shaderBlockLayouts.get(uniformBufferName)?.byteLength || 0;
+        return Math.max(packedByteLength, minUniformBufferSize);
     }
-    /** Get formatted binary memory that can be uploaded to a buffer */
+    /**
+     * Returns packed binary data that can be uploaded to the named uniform buffer.
+     *
+     * The returned view length matches the packed block size and is not padded to
+     * the store's minimum allocation size.
+     */
     getUniformBufferData(uniformBufferName) {
         const uniformValues = this.uniformBlocks.get(uniformBufferName)?.getAllUniforms() || {};
-        // @ts-ignore
-        return this.uniformBufferLayouts.get(uniformBufferName)?.getData(uniformValues);
+        const shaderBlockWriter = this.shaderBlockWriters.get(uniformBufferName);
+        return shaderBlockWriter?.getData(uniformValues) || new Uint8Array(0);
     }
     /**
-     * Creates an unmanaged uniform buffer (umnanaged means that application is responsible for destroying it)
-     * The new buffer is initialized with current / supplied values
+     * Creates an unmanaged uniform buffer initialized with the current or supplied values.
      */
-    createUniformBuffer(device, uniformBufferName, uniforms) {
+    createUniformBuffer(uniformBufferName, uniforms) {
         if (uniforms) {
             this.setUniforms(uniforms);
         }
         const byteLength = this.getUniformBufferByteLength(uniformBufferName);
-        const uniformBuffer = device.createBuffer({
+        const uniformBuffer = this.device.createBuffer({
             usage: Buffer.UNIFORM | Buffer.COPY_DST,
             byteLength
         });
@@ -84,11 +115,11 @@ export class UniformStore {
         uniformBuffer.write(uniformBufferData);
         return uniformBuffer;
     }
-    /** Get the managed uniform buffer. "managed" resources are destroyed when the uniformStore is destroyed. */
-    getManagedUniformBuffer(device, uniformBufferName) {
+    /** Returns the managed uniform buffer for the named block. */
+    getManagedUniformBuffer(uniformBufferName) {
         if (!this.uniformBuffers.get(uniformBufferName)) {
             const byteLength = this.getUniformBufferByteLength(uniformBufferName);
-            const uniformBuffer = device.createBuffer({
+            const uniformBuffer = this.device.createBuffer({
                 usage: Buffer.UNIFORM | Buffer.COPY_DST,
                 byteLength
             });
@@ -98,7 +129,11 @@ export class UniformStore {
         // @ts-ignore
         return this.uniformBuffers.get(uniformBufferName);
     }
-    /** Updates all uniform buffers where values have changed */
+    /**
+     * Updates every managed uniform buffer whose source uniforms have changed.
+     *
+     * @returns The first redraw reason encountered, or `false` if nothing changed.
+     */
     updateUniformBuffers() {
         let reason = false;
         for (const uniformBufferName of this.uniformBlocks.keys()) {
@@ -110,7 +145,11 @@ export class UniformStore {
         }
         return reason;
     }
-    /** Update one uniform buffer. Only updates if values have changed */
+    /**
+     * Updates one managed uniform buffer if its corresponding block is dirty.
+     *
+     * @returns The redraw reason for the update, or `false` if no write occurred.
+     */
     updateUniformBuffer(uniformBufferName) {
         const uniformBlock = this.uniformBlocks.get(uniformBufferName);
         let uniformBuffer = this.uniformBuffers.get(uniformBufferName);
@@ -128,4 +167,10 @@ export class UniformStore {
         return reason;
     }
 }
+/**
+ * Returns the default uniform-buffer layout for the supplied device.
+ */
+function getDefaultUniformBufferLayout(device) {
+    return device.type === 'webgpu' ? 'wgsl-uniform' : 'std140';
+}
 //# sourceMappingURL=uniform-store.js.map

package/dist/portable/uniform-store.js.map

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