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

package/dist/portable/uniform-buffer-layout.js

@@ -1,274 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { alignTo } from "../shadertypes/data-types/decode-data-types.js";
-import { getVariableShaderTypeInfo, resolveVariableShaderTypeAlias } from "../shadertypes/shader-types/shader-type-decoder.js";
-import { getScratchArrayBuffer } from "../utils/array-utils-flat.js";
-import { isNumberArray } from "../utils/is-array.js";
-import { log } from "../utils/log.js";
-/**
- * Smallest buffer size that can be used for uniform buffers.
- * TODO - does this depend on device?
- */
-const minBufferSize = 1024;
-/**
- * Std140 layout for uniform buffers
- * Supports manual listing of uniforms
- */
-export class UniformBufferLayout {
-    layout = {};
-    uniformTypes;
-    /** number of bytes needed for buffer allocation */
-    byteLength;
-    /** Create a new UniformBufferLayout given a map of attributes. */
-    constructor(uniformTypes) {
-        this.uniformTypes = { ...uniformTypes };
-        let size = 0;
-        for (const [key, uniformType] of Object.entries(this.uniformTypes)) {
-            size = this._addToLayout(key, uniformType, size);
-        }
-        size = alignTo(size, 4);
-        this.byteLength = Math.max(size * 4, minBufferSize);
-    }
-    /** Does this layout have a field with specified name */
-    has(name) {
-        return Boolean(this.layout[name]);
-    }
-    /** Get offset and size for a field with specified name */
-    get(name) {
-        const layout = this.layout[name];
-        return layout;
-    }
-    /** Flatten nested uniform values into leaf-path values understood by UniformBlock. */
-    getFlatUniformValues(uniformValues) {
-        const flattenedUniformValues = {};
-        for (const [name, value] of Object.entries(uniformValues)) {
-            const uniformType = this.uniformTypes[name];
-            if (uniformType) {
-                this._flattenCompositeValue(flattenedUniformValues, name, uniformType, value);
-            }
-            else if (this.layout[name]) {
-                flattenedUniformValues[name] = value;
-            }
-        }
-        return flattenedUniformValues;
-    }
-    /** Get the data for the complete buffer */
-    getData(uniformValues) {
-        const buffer = getScratchArrayBuffer(this.byteLength);
-        new Uint8Array(buffer, 0, this.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.byteLength);
-    }
-    // Recursively add a uniform to the layout
-    _addToLayout(name, type, offset) {
-        if (typeof type === 'string') {
-            const info = getLeafLayoutInfo(type);
-            const alignedOffset = alignTo(offset, info.alignment);
-            this.layout[name] = {
-                offset: alignedOffset,
-                ...info
-            };
-            return alignedOffset + info.size;
-        }
-        if (Array.isArray(type)) {
-            if (Array.isArray(type[0])) {
-                throw new Error(`Nested arrays are not supported for ${name}`);
-            }
-            const elementType = type[0];
-            const length = type[1];
-            const stride = alignTo(getTypeSize(elementType), 4);
-            const arrayOffset = alignTo(offset, 4);
-            for (let i = 0; i < length; i++) {
-                this._addToLayout(`${name}[${i}]`, elementType, arrayOffset + i * stride);
-            }
-            return arrayOffset + stride * length;
-        }
-        if (isCompositeShaderTypeStruct(type)) {
-            let structOffset = alignTo(offset, 4);
-            for (const [memberName, memberType] of Object.entries(type)) {
-                structOffset = this._addToLayout(`${name}.${memberName}`, memberType, structOffset);
-            }
-            return alignTo(structOffset, 4);
-        }
-        throw new Error(`Unsupported CompositeShaderType for ${name}`);
-    }
-    _flattenCompositeValue(flattenedUniformValues, baseName, uniformType, value) {
-        if (value === undefined) {
-            return;
-        }
-        if (typeof uniformType === 'string' || this.layout[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)();
-    }
-    _flattenPackedArray(flattenedUniformValues, baseName, elementType, length, value) {
-        const numericValue = value;
-        const elementLayout = getLeafLayoutInfo(elementType);
-        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);
-            }
-        }
-    }
-    _writeLeafValue(typedArrays, name, value) {
-        const layout = this.layout[name];
-        if (!layout) {
-            log.warn(`Uniform ${name} not found in layout`)();
-            return;
-        }
-        const { type, components, columns, rows, offset } = layout;
-        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 * 4;
-            for (let rowIndex = 0; rowIndex < rows; rowIndex++) {
-                array[columnOffset + rowIndex] = Number(sourceValue[sourceIndex++] ?? 0);
-            }
-        }
-    }
-}
-function getTypeSize(type) {
-    if (typeof type === 'string') {
-        return getLeafLayoutInfo(type).size;
-    }
-    if (Array.isArray(type)) {
-        const elementType = type[0];
-        const length = type[1];
-        if (Array.isArray(elementType)) {
-            throw new Error('Nested arrays are not supported');
-        }
-        return alignTo(getTypeSize(elementType), 4) * length;
-    }
-    let size = 0;
-    for (const memberType of Object.values(type)) {
-        const compositeMemberType = memberType;
-        size = alignTo(size, getTypeAlignment(compositeMemberType));
-        size += getTypeSize(compositeMemberType);
-    }
-    return alignTo(size, 4);
-}
-function getTypeAlignment(type) {
-    if (typeof type === 'string') {
-        return getLeafLayoutInfo(type).alignment;
-    }
-    if (Array.isArray(type)) {
-        return 4;
-    }
-    return 4;
-}
-function getLeafLayoutInfo(type) {
-    const resolvedType = resolveVariableShaderTypeAlias(type);
-    const decodedType = getVariableShaderTypeInfo(resolvedType);
-    const matrixMatch = /^mat(\d)x(\d)<.+>$/.exec(resolvedType);
-    if (matrixMatch) {
-        const columns = Number(matrixMatch[1]);
-        const rows = Number(matrixMatch[2]);
-        return {
-            alignment: 4,
-            size: columns * 4,
-            components: columns * rows,
-            columns,
-            rows,
-            shaderType: resolvedType,
-            type: decodedType.type
-        };
-    }
-    const vectorMatch = /^vec(\d)<.+>$/.exec(resolvedType);
-    if (vectorMatch) {
-        const components = Number(vectorMatch[1]);
-        return {
-            alignment: components === 2 ? 2 : 4,
-            size: components === 3 ? 4 : components,
-            components,
-            columns: 1,
-            rows: components,
-            shaderType: resolvedType,
-            type: decodedType.type
-        };
-    }
-    return {
-        alignment: 1,
-        size: 1,
-        components: 1,
-        columns: 1,
-        rows: 1,
-        shaderType: resolvedType,
-        type: decodedType.type
-    };
-}
-function isCompositeShaderTypeStruct(value) {
-    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
-}
-function isCompositeUniformObject(value) {
-    return (Boolean(value) &&
-        typeof value === 'object' &&
-        !Array.isArray(value) &&
-        !ArrayBuffer.isView(value));
-}
-function sliceNumericArray(value, start, end) {
-    return Array.prototype.slice.call(value, start, end);
-}
-//# sourceMappingURL=uniform-buffer-layout.js.map

package/dist/portable/uniform-buffer-layout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"uniform-buffer-layout.js","sourceRoot":"","sources":["../../src/portable/uniform-buffer-layout.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAOpC,OAAO,EAAC,OAAO,EAAC,uDAAoD;AACpE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,EAC/B,2DAAwD;AAGzD,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAChE,OAAO,EAAC,aAAa,EAAC,6BAA0B;AAChD,OAAO,EAAC,GAAG,EAAC,wBAAqB;AAcjC;;;GAGG;AACH,MAAM,aAAa,GAAW,IAAI,CAAC;AAEnC;;;GAGG;AACH,MAAM,OAAO,mBAAmB;IACrB,MAAM,GAAuC,EAAE,CAAC;IAChD,YAAY,CAAsC;IAE3D,mDAAmD;IAC1C,UAAU,CAAS;IAE5B,kEAAkE;IAClE,YAAY,YAA2D;QACrE,IAAI,CAAC,YAAY,GAAG,EAAC,GAAG,YAAY,EAAC,CAAC;QAEtC,IAAI,IAAI,GAAG,CAAC,CAAC;QAEb,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACnE,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC;IAED,wDAAwD;IACxD,GAAG,CAAC,IAAY;QACd,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,0DAA0D;IAC1D,GAAG,CAAC,IAAY;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sFAAsF;IACtF,oBAAoB,CAAC,aAAsC;QACzD,MAAM,sBAAsB,GAAiC,EAAE,CAAC;QAEhE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAChF,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7B,sBAAsB,CAAC,IAAI,CAAC,GAAG,KAAqB,CAAC;YACvD,CAAC;QACH,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,2CAA2C;IAC3C,OAAO,CAAC,aAAsC;QAC5C,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG;YAClB,GAAG,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC3B,GAAG,EAAE,IAAI,WAAW,CAAC,MAAM,CAAC;YAC5B,GAAG,EAAE,IAAI,YAAY,CAAC,MAAM,CAAC;YAC7B,GAAG,EAAE,IAAI,WAAW,CAAC,MAAM,CAAC;SAC7B,CAAC;QAEF,MAAM,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACxE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;IAED,0CAA0C;IAClC,YAAY,CAAC,IAAY,EAAE,IAAyB,EAAE,MAAc;QAC1E,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;gBAClB,MAAM,EAAE,aAAa;gBACrB,GAAG,IAAI;aACR,CAAC;YACF,OAAO,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;QACnC,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAwB,CAAC;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;YAC5E,CAAC;YACD,OAAO,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;QACvC,CAAC;QAED,IAAI,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5D,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,UAAU,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YACtF,CAAC;YACD,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAC;IACjE,CAAC;IAEO,sBAAsB,CAC5B,sBAAoD,EACpD,QAAgB,EAChB,WAAgC,EAChC,KAAwC;QAExC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7D,sBAAsB,CAAC,QAAQ,CAAC,GAAG,KAAqB,CAAC;YACzD,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAwB,CAAC;YAC1D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAW,CAAC;YAExC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,uCAAuC,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;gBACtE,OAAO;YACT,CAAC;YAED,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gBACpE,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;gBAClC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;oBAC/B,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,sBAAsB,CACzB,sBAAsB,EACtB,GAAG,QAAQ,IAAI,KAAK,GAAG,EACvB,WAAW,EACX,YAAY,CACb,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,2BAA2B,CAAC,WAAW,CAAC,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;YAChF,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAC;gBACxC,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9F,CAAC;YACD,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,iCAAiC,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;IAClE,CAAC;IAEO,mBAAmB,CACzB,sBAAoD,EACpD,QAAgB,EAChB,WAA+B,EAC/B,MAAc,EACd,KAAmB;QAEnB,MAAM,YAAY,GAAG,KAAoC,CAAC;QAC1D,MAAM,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACrD,MAAM,mBAAmB,GAAG,aAAa,CAAC,UAAU,CAAC;QAErD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,KAAK,GAAG,mBAAmB,CAAC;YAC1C,IAAI,KAAK,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACjC,MAAM;YACR,CAAC;YAED,IAAI,mBAAmB,KAAK,CAAC,EAAE,CAAC;gBAC9B,sBAAsB,CAAC,GAAG,QAAQ,IAAI,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAChF,CAAC;iBAAM,CAAC;gBACN,sBAAsB,CAAC,GAAG,QAAQ,IAAI,KAAK,GAAG,CAAC,GAAG,iBAAiB,CACjE,KAAK,EACL,KAAK,EACL,KAAK,GAAG,mBAAmB,CACZ,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,eAAe,CACrB,WAAgC,EAChC,IAAY,EACZ,KAAmB;QAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,sBAAsB,CAAC,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QAED,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;QACzD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,KAAoC,CAAC;QAEzD,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAClB,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,UAAU,EAAE,cAAc,EAAE,EAAE,CAAC;gBAC3E,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5E,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,KAAK,IAAI,WAAW,GAAG,CAAC,EAAE,WAAW,GAAG,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC;YAC/D,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,GAAG,CAAC,CAAC;YAC9C,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC;gBACnD,KAAK,CAAC,YAAY,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,SAAS,WAAW,CAAC,IAAyB;IAC5C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACtC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAwB,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;QAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC;IACvD,CAAC;IAED,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,mBAAmB,GAAG,UAAiC,CAAC;QAC9D,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC5D,IAAI,IAAI,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAyB;IACjD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAwB;IAExB,MAAM,YAAY,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,yBAAyB,CAAC,YAAY,CAAC,CAAC;IAC5D,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE5D,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpC,OAAO;YACL,SAAS,EAAE,CAAC;YACZ,IAAI,EAAE,OAAO,GAAG,CAAC;YACjB,UAAU,EAAE,OAAO,GAAG,IAAI;YAC1B,OAAO;YACP,IAAI;YACJ,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAc,CAAC;QACvD,OAAO;YACL,SAAS,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;YACvC,UAAU;YACV,OAAO,EAAE,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,CAAC;QACP,UAAU,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,CAAC;QACP,UAAU,EAAE,YAAY;QACxB,IAAI,EAAE,WAAW,CAAC,IAAI;KACvB,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,KAA0B;IAE1B,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,wBAAwB,CAC/B,KAA4B;IAE5B,OAAO,CACL,OAAO,CAAC,KAAK,CAAC;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAmB,EAAE,KAAa,EAAE,GAAW;IACxE,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAa,CAAC;AACnE,CAAC"}

package/src/portable/uniform-buffer-layout.ts

@@ -1,384 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-import type {PrimitiveDataType} from '../shadertypes/data-types/data-types';
-import type {
-  CompositeShaderType,
-  VariableShaderType
-} from '../shadertypes/shader-types/shader-types';
-import {alignTo} from '../shadertypes/data-types/decode-data-types';
-import {
-  getVariableShaderTypeInfo,
-  resolveVariableShaderTypeAlias
-} from '../shadertypes/shader-types/shader-type-decoder';
-
-import type {CompositeUniformValue, UniformValue} from '../adapter/types/uniforms';
-import {getScratchArrayBuffer} from '../utils/array-utils-flat';
-import {isNumberArray} from '../utils/is-array';
-import {log} from '../utils/log';
-
-type UniformLayoutEntry = {
-  offset: number;
-  size: number;
-  components: number;
-  columns: number;
-  rows: number;
-  shaderType: VariableShaderType;
-  type: PrimitiveDataType;
-};
-
-export type UniformValues = Record<string, CompositeUniformValue>;
-
-/**
- * Smallest buffer size that can be used for uniform buffers.
- * TODO - does this depend on device?
- */
-const minBufferSize: number = 1024;
-
-/**
- * Std140 layout for uniform buffers
- * Supports manual listing of uniforms
- */
-export class UniformBufferLayout {
-  readonly layout: Record<string, UniformLayoutEntry> = {};
-  readonly uniformTypes: Record<string, CompositeShaderType>;
-
-  /** number of bytes needed for buffer allocation */
-  readonly byteLength: number;
-
-  /** Create a new UniformBufferLayout given a map of attributes. */
-  constructor(uniformTypes: Readonly<Record<string, CompositeShaderType>>) {
-    this.uniformTypes = {...uniformTypes};
-
-    let size = 0;
-
-    for (const [key, uniformType] of Object.entries(this.uniformTypes)) {
-      size = this._addToLayout(key, uniformType, size);
-    }
-
-    size = alignTo(size, 4);
-    this.byteLength = Math.max(size * 4, minBufferSize);
-  }
-
-  /** Does this layout have a field with specified name */
-  has(name: string) {
-    return Boolean(this.layout[name]);
-  }
-
-  /** Get offset and size for a field with specified name */
-  get(name: string): {offset: number; size: number} | undefined {
-    const layout = this.layout[name];
-    return layout;
-  }
-
-  /** Flatten nested uniform values into leaf-path values understood by UniformBlock. */
-  getFlatUniformValues(uniformValues: Readonly<UniformValues>): Record<string, UniformValue> {
-    const flattenedUniformValues: Record<string, UniformValue> = {};
-
-    for (const [name, value] of Object.entries(uniformValues)) {
-      const uniformType = this.uniformTypes[name];
-      if (uniformType) {
-        this._flattenCompositeValue(flattenedUniformValues, name, uniformType, value);
-      } else if (this.layout[name]) {
-        flattenedUniformValues[name] = value as UniformValue;
-      }
-    }
-
-    return flattenedUniformValues;
-  }
-
-  /** Get the data for the complete buffer */
-  getData(uniformValues: Readonly<UniformValues>): Uint8Array {
-    const buffer = getScratchArrayBuffer(this.byteLength);
-    new Uint8Array(buffer, 0, this.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.byteLength);
-  }
-
-  // Recursively add a uniform to the layout
-  private _addToLayout(name: string, type: CompositeShaderType, offset: number): number {
-    if (typeof type === 'string') {
-      const info = getLeafLayoutInfo(type);
-      const alignedOffset = alignTo(offset, info.alignment);
-      this.layout[name] = {
-        offset: alignedOffset,
-        ...info
-      };
-      return alignedOffset + info.size;
-    }
-
-    if (Array.isArray(type)) {
-      if (Array.isArray(type[0])) {
-        throw new Error(`Nested arrays are not supported for ${name}`);
-      }
-
-      const elementType = type[0] as CompositeShaderType;
-      const length = type[1] as number;
-      const stride = alignTo(getTypeSize(elementType), 4);
-      const arrayOffset = alignTo(offset, 4);
-
-      for (let i = 0; i < length; i++) {
-        this._addToLayout(`${name}[${i}]`, elementType, arrayOffset + i * stride);
-      }
-      return arrayOffset + stride * length;
-    }
-
-    if (isCompositeShaderTypeStruct(type)) {
-      let structOffset = alignTo(offset, 4);
-      for (const [memberName, memberType] of Object.entries(type)) {
-        structOffset = this._addToLayout(`${name}.${memberName}`, memberType, structOffset);
-      }
-      return alignTo(structOffset, 4);
-    }
-
-    throw new Error(`Unsupported CompositeShaderType for ${name}`);
-  }
-
-  private _flattenCompositeValue(
-    flattenedUniformValues: Record<string, UniformValue>,
-    baseName: string,
-    uniformType: CompositeShaderType,
-    value: CompositeUniformValue | undefined
-  ): void {
-    if (value === undefined) {
-      return;
-    }
-
-    if (typeof uniformType === 'string' || this.layout[baseName]) {
-      flattenedUniformValues[baseName] = value as UniformValue;
-      return;
-    }
-
-    if (Array.isArray(uniformType)) {
-      const elementType = uniformType[0] as CompositeShaderType;
-      const length = uniformType[1] as number;
-
-      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)();
-  }
-
-  private _flattenPackedArray(
-    flattenedUniformValues: Record<string, UniformValue>,
-    baseName: string,
-    elementType: VariableShaderType,
-    length: number,
-    value: UniformValue
-  ): void {
-    const numericValue = value as Readonly<ArrayLike<number>>;
-    const elementLayout = getLeafLayoutInfo(elementType);
-    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
-        ) as UniformValue;
-      }
-    }
-  }
-
-  private _writeLeafValue(
-    typedArrays: Record<string, any>,
-    name: string,
-    value: UniformValue
-  ): void {
-    const layout = this.layout[name];
-    if (!layout) {
-      log.warn(`Uniform ${name} not found in layout`)();
-      return;
-    }
-
-    const {type, components, columns, rows, offset} = layout;
-    const array = typedArrays[type];
-
-    if (components === 1) {
-      array[offset] = Number(value);
-      return;
-    }
-
-    const sourceValue = value as Readonly<ArrayLike<number>>;
-
-    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 * 4;
-      for (let rowIndex = 0; rowIndex < rows; rowIndex++) {
-        array[columnOffset + rowIndex] = Number(sourceValue[sourceIndex++] ?? 0);
-      }
-    }
-  }
-}
-
-function getTypeSize(type: CompositeShaderType): number {
-  if (typeof type === 'string') {
-    return getLeafLayoutInfo(type).size;
-  }
-
-  if (Array.isArray(type)) {
-    const elementType = type[0] as CompositeShaderType;
-    const length = type[1] as number;
-
-    if (Array.isArray(elementType)) {
-      throw new Error('Nested arrays are not supported');
-    }
-
-    return alignTo(getTypeSize(elementType), 4) * length;
-  }
-
-  let size = 0;
-  for (const memberType of Object.values(type)) {
-    const compositeMemberType = memberType as CompositeShaderType;
-    size = alignTo(size, getTypeAlignment(compositeMemberType));
-    size += getTypeSize(compositeMemberType);
-  }
-
-  return alignTo(size, 4);
-}
-
-function getTypeAlignment(type: CompositeShaderType): 1 | 2 | 4 {
-  if (typeof type === 'string') {
-    return getLeafLayoutInfo(type).alignment;
-  }
-
-  if (Array.isArray(type)) {
-    return 4;
-  }
-
-  return 4;
-}
-
-function getLeafLayoutInfo(
-  type: VariableShaderType
-): Omit<UniformLayoutEntry, 'offset'> & {alignment: 1 | 2 | 4} {
-  const resolvedType = resolveVariableShaderTypeAlias(type);
-  const decodedType = getVariableShaderTypeInfo(resolvedType);
-  const matrixMatch = /^mat(\d)x(\d)<.+>$/.exec(resolvedType);
-
-  if (matrixMatch) {
-    const columns = Number(matrixMatch[1]);
-    const rows = Number(matrixMatch[2]);
-
-    return {
-      alignment: 4,
-      size: columns * 4,
-      components: columns * rows,
-      columns,
-      rows,
-      shaderType: resolvedType,
-      type: decodedType.type
-    };
-  }
-
-  const vectorMatch = /^vec(\d)<.+>$/.exec(resolvedType);
-  if (vectorMatch) {
-    const components = Number(vectorMatch[1]) as 2 | 3 | 4;
-    return {
-      alignment: components === 2 ? 2 : 4,
-      size: components === 3 ? 4 : components,
-      components,
-      columns: 1,
-      rows: components,
-      shaderType: resolvedType,
-      type: decodedType.type
-    };
-  }
-
-  return {
-    alignment: 1,
-    size: 1,
-    components: 1,
-    columns: 1,
-    rows: 1,
-    shaderType: resolvedType,
-    type: decodedType.type
-  };
-}
-
-function isCompositeShaderTypeStruct(
-  value: CompositeShaderType
-): value is Record<string, CompositeShaderType> {
-  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
-}
-
-function isCompositeUniformObject(
-  value: CompositeUniformValue
-): value is Record<string, CompositeUniformValue | undefined> {
-  return (
-    Boolean(value) &&
-    typeof value === 'object' &&
-    !Array.isArray(value) &&
-    !ArrayBuffer.isView(value)
-  );
-}
-
-function sliceNumericArray(value: UniformValue, start: number, end: number): number[] {
-  return Array.prototype.slice.call(value, start, end) as number[];
-}