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

package/dist/shader-inputs.js

@@ -37,7 +37,7 @@ export class ShaderInputs {
     modules, options) {
         Object.assign(this.options, options);
         // Extract modules with dependencies
-        const resolvedModules = getShaderModuleDependencies(Object.values(modules).filter(module => module.dependencies));
+        const resolvedModules = getShaderModuleDependencies(Object.values(modules).filter(isShaderInputsModuleWithDependencies));
         for (const resolvedModule of resolvedModules) {
             // @ts-ignore
             modules[resolvedModule.name] = resolvedModule;
@@ -50,6 +50,9 @@ export class ShaderInputs {
         this.moduleBindings = {};
         // Initialize the modules
         for (const [name, module] of Object.entries(modules)) {
+            if (!module) {
+                continue;
+            }
             this._addModule(module);
             if (module.name && name !== module.name && !this.options.disableWarnings) {
                 log.warn(`Module name: ${name} vs ${module.name}`)();
@@ -76,8 +79,8 @@ export class ShaderInputs {
             const oldUniforms = this.moduleUniforms[moduleName];
             const oldBindings = this.moduleBindings[moduleName];
             const uniformsAndBindings = module.getUniforms?.(moduleProps, oldUniforms) || moduleProps;
-            const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings);
-            this.moduleUniforms[moduleName] = { ...oldUniforms, ...uniforms };
+            const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings, module.uniformTypes);
+            this.moduleUniforms[moduleName] = mergeModuleUniforms(oldUniforms, uniforms, module.uniformTypes);
             this.moduleBindings[moduleName] = { ...oldBindings, ...bindings };
             // this.moduleUniformsChanged ||= moduleName;
             // console.log(`setProps(${String(moduleName)}`, moduleName, this.moduleUniforms[moduleName])
@@ -119,8 +122,85 @@ export class ShaderInputs {
     _addModule(module) {
         const moduleName = module.name;
         // Get default uniforms from module
-        this.moduleUniforms[moduleName] = module.defaultUniforms || {};
+        this.moduleUniforms[moduleName] = mergeModuleUniforms({}, (module.defaultUniforms || {}), module.uniformTypes);
         this.moduleBindings[moduleName] = {};
     }
 }
+function mergeModuleUniforms(currentUniforms = {}, nextUniforms = {}, uniformTypes = {}) {
+    const mergedUniforms = { ...currentUniforms };
+    for (const [key, value] of Object.entries(nextUniforms)) {
+        if (value === undefined) {
+            continue;
+        }
+        mergedUniforms[key] = mergeModuleUniformValue(currentUniforms[key], value, uniformTypes[key]);
+    }
+    return mergedUniforms;
+}
+function mergeModuleUniformValue(currentValue, nextValue, uniformType) {
+    if (!uniformType || typeof uniformType === 'string') {
+        return cloneModuleUniformValue(nextValue);
+    }
+    if (Array.isArray(uniformType)) {
+        if (isPackedUniformArrayValue(nextValue) || !Array.isArray(nextValue)) {
+            return cloneModuleUniformValue(nextValue);
+        }
+        const currentArray = Array.isArray(currentValue) && !isPackedUniformArrayValue(currentValue)
+            ? [...currentValue]
+            : [];
+        const mergedArray = currentArray.slice();
+        for (let index = 0; index < nextValue.length; index++) {
+            const elementValue = nextValue[index];
+            if (elementValue === undefined) {
+                continue;
+            }
+            mergedArray[index] = mergeModuleUniformValue(currentArray[index], elementValue, uniformType[0]);
+        }
+        return mergedArray;
+    }
+    if (!isPlainUniformObject(nextValue)) {
+        return cloneModuleUniformValue(nextValue);
+    }
+    const uniformStruct = uniformType;
+    const currentObject = isPlainUniformObject(currentValue) ? currentValue : {};
+    const mergedObject = { ...currentObject };
+    for (const [key, value] of Object.entries(nextValue)) {
+        if (value === undefined) {
+            continue;
+        }
+        mergedObject[key] = mergeModuleUniformValue(currentObject[key], value, uniformStruct[key]);
+    }
+    return mergedObject;
+}
+function cloneModuleUniformValue(value) {
+    if (ArrayBuffer.isView(value)) {
+        return Array.prototype.slice.call(value);
+    }
+    if (Array.isArray(value)) {
+        if (isPackedUniformArrayValue(value)) {
+            return value.slice();
+        }
+        const compositeArray = value;
+        return compositeArray.map(element => element === undefined ? undefined : cloneModuleUniformValue(element));
+    }
+    if (isPlainUniformObject(value)) {
+        return Object.fromEntries(Object.entries(value).map(([key, nestedValue]) => [
+            key,
+            nestedValue === undefined ? undefined : cloneModuleUniformValue(nestedValue)
+        ]));
+    }
+    return value;
+}
+function isPackedUniformArrayValue(value) {
+    return (ArrayBuffer.isView(value) ||
+        (Array.isArray(value) && (value.length === 0 || typeof value[0] === 'number')));
+}
+function isPlainUniformObject(value) {
+    return (Boolean(value) &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        !ArrayBuffer.isView(value));
+}
+function isShaderInputsModuleWithDependencies(module) {
+    return Boolean(module?.dependencies);
+}
 //# sourceMappingURL=shader-inputs.js.map

package/dist/shader-inputs.js.map

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

package/dist/utils/shader-module-utils.d.ts

@@ -0,0 +1,7 @@
+import type { ComputeShaderLayout, ShaderLayout } from '@luma.gl/core';
+import type { ShaderModule } from '@luma.gl/shadertools';
+type AnyShaderLayout = ShaderLayout | ComputeShaderLayout;
+export declare function mergeShaderModuleBindingsIntoLayout<TShaderLayout extends AnyShaderLayout>(shaderLayout: TShaderLayout | null | undefined, modules: ShaderModule[]): TShaderLayout | null | undefined;
+export declare function shaderModuleHasUniforms(module: ShaderModule): boolean;
+export {};
+//# sourceMappingURL=shader-module-utils.d.ts.map

package/dist/utils/shader-module-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module-utils.d.ts","sourceRoot":"","sources":["../../src/utils/shader-module-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,KAAK,eAAe,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAE1D,wBAAgB,mCAAmC,CAAC,aAAa,SAAS,eAAe,EACvF,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,EAC9C,OAAO,EAAE,YAAY,EAAE,GACtB,aAAa,GAAG,IAAI,GAAG,SAAS,CA4BlC;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAErE"}

package/dist/utils/shader-module-utils.js

@@ -0,0 +1,46 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export function mergeShaderModuleBindingsIntoLayout(shaderLayout, modules) {
+    if (!shaderLayout || !modules.some(module => module.bindingLayout?.length)) {
+        return shaderLayout;
+    }
+    const mergedLayout = {
+        ...shaderLayout,
+        bindings: shaderLayout.bindings.map(binding => ({ ...binding }))
+    };
+    if ('attributes' in (shaderLayout || {})) {
+        mergedLayout.attributes = shaderLayout?.attributes || [];
+    }
+    for (const module of modules) {
+        for (const bindingLayout of module.bindingLayout || []) {
+            for (const relatedBindingName of getRelatedBindingNames(bindingLayout.name)) {
+                const binding = mergedLayout.bindings.find(candidate => candidate.name === relatedBindingName);
+                if (binding?.group === 0) {
+                    binding.group = bindingLayout.group;
+                }
+            }
+        }
+    }
+    return mergedLayout;
+}
+export function shaderModuleHasUniforms(module) {
+    return Boolean(module.uniformTypes && !isObjectEmpty(module.uniformTypes));
+}
+/** Returns binding-name aliases that should share the module-declared bind group. */
+function getRelatedBindingNames(bindingName) {
+    const bindingNames = new Set([bindingName, `${bindingName}Uniforms`]);
+    if (!bindingName.endsWith('Uniforms')) {
+        bindingNames.add(`${bindingName}Sampler`);
+    }
+    return [...bindingNames];
+}
+function isObjectEmpty(obj) {
+    // @ts-ignore key is intentionally unused
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    for (const key in obj) {
+        return false;
+    }
+    return true;
+}
+//# sourceMappingURL=shader-module-utils.js.map

package/dist/utils/shader-module-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module-utils.js","sourceRoot":"","sources":["../../src/utils/shader-module-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAOpC,MAAM,UAAU,mCAAmC,CACjD,YAA8C,EAC9C,OAAuB;IAEvB,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;QAC3E,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,YAAY,GAAG;QACnB,GAAG,YAAY;QACf,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAC,GAAG,OAAO,EAAC,CAAC,CAAC;KAC9C,CAAC;IAEnB,IAAI,YAAY,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACxC,YAA6B,CAAC,UAAU,GAAI,YAA6B,EAAE,UAAU,IAAI,EAAE,CAAC;IAC/F,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;YACvD,KAAK,MAAM,kBAAkB,IAAI,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5E,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CACxC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,kBAAkB,CACnD,CAAC;gBACF,IAAI,OAAO,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAoB;IAC1D,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,qFAAqF;AACrF,SAAS,sBAAsB,CAAC,WAAmB;IACjD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,CAAC,WAAW,EAAE,GAAG,WAAW,UAAU,CAAC,CAAC,CAAC;IAE9E,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,YAAY,CAAC,GAAG,CAAC,GAAG,WAAW,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IAChC,yCAAyC;IACzC,6DAA6D;IAC7D,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.3.0-alpha.6",
+  "version": "9.3.0-alpha.9",
   "description": "3D Engine Components for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,8 +40,8 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "9.2.0-alpha.6",
-    "@luma.gl/shadertools": "9.2.0-alpha.6"
+    "@luma.gl/core": "9.3.0-alpha.6",
+    "@luma.gl/shadertools": "9.3.0-alpha.6"
   },
   "dependencies": {
     "@math.gl/core": "^4.1.0",
@@ -49,5 +49,5 @@
     "@probe.gl/log": "^4.1.1",
     "@probe.gl/stats": "^4.1.1"
   },
-  "gitHead": "59fda5480c4d0bb3d64545d4621175221f2b6c7c"
+  "gitHead": "737b0f752b3f8a6ae920b394d5ca028427275b37"
 }

package/src/animation-loop/animation-loop.ts

@@ -156,6 +156,9 @@ export class AnimationLoop {
         // Create the WebGL context
         await this._initDevice();
         this._initialize();
+        if (!this._running) {
+          return null;
+        }
 
         // Note: onIntialize can return a promise (e.g. in case app needs to load resources)
         await this.props.onInitialize(this._getAnimationProps());

package/src/compute/computation.ts

@@ -2,22 +2,28 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {DeviceFeature, ComputePipelineProps, Shader, Binding} from '@luma.gl/core';
 import {
+  type DeviceFeature,
+  type ComputePipelineProps,
+  type Shader,
+  type Binding,
   Device,
   Buffer,
   ComputePipeline,
   ComputePass,
+  PipelineFactory,
+  ShaderFactory,
   UniformStore,
   log,
-  getTypedArrayConstructor
+  dataTypeDecoder
 } from '@luma.gl/core';
-import type {ShaderModule, PlatformInfo} from '@luma.gl/shadertools';
-import {ShaderAssembler} from '@luma.gl/shadertools';
-import {TypedArray, isNumericArray} from '@math.gl/types';
+import {type ShaderModule, type PlatformInfo, ShaderAssembler} from '@luma.gl/shadertools';
+import {type TypedArray, isNumericArray} from '@math.gl/types';
 import {ShaderInputs} from '../shader-inputs';
-import {PipelineFactory} from '../factories/pipeline-factory';
-import {ShaderFactory} from '../factories/shader-factory';
+import {
+  mergeShaderModuleBindingsIntoLayout,
+  shaderModuleHasUniforms
+} from '../utils/shader-module-utils';
 import {uid} from '../utils/uid';
 // import {getDebugTableForShaderLayout} from '../debug/debug-shader-layout';
 
@@ -131,11 +137,6 @@ export class Computation {
     this.shaderInputs = props.shaderInputs || new ShaderInputs(moduleMap);
     this.setShaderInputs(this.shaderInputs);
 
-    // Support WGSL shader layout introspection
-    // TODO - Don't modify props!!
-    // @ts-expect-error method on WebGPUDevice
-    this.props.shaderLayout ||= device.getShaderLayout(this.props.source);
-
     // Setup shader assembler
     const platformInfo = getPlatformInfo(device);
 
@@ -143,6 +144,9 @@ export class Computation {
     const modules =
       (this.props.modules?.length > 0 ? this.props.modules : this.shaderInputs?.getModules()) || [];
 
+    this.props.shaderLayout =
+      mergeShaderModuleBindingsIntoLayout(this.props.shaderLayout, modules) || null;
+
     this.pipelineFactory =
       props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
     this.shaderFactory = props.shaderFactory || ShaderFactory.getDefaultShaderFactory(this.device);
@@ -156,6 +160,14 @@ export class Computation {
     this.source = source;
     // @ts-ignore
     this._getModuleUniforms = getUniforms;
+    const inferredShaderLayout = (
+      device as Device & {getShaderLayout?: (source: string) => any}
+    ).getShaderLayout?.(this.source);
+    this.props.shaderLayout =
+      mergeShaderModuleBindingsIntoLayout(
+        this.props.shaderLayout || inferredShaderLayout || null,
+        modules
+      ) || null;
 
     // Create the pipeline
     // @note order is important
@@ -198,7 +210,7 @@ export class Computation {
       this.pipeline.setBindings(this.bindings);
       computePass.setPipeline(this.pipeline);
       // @ts-expect-error
-      computePass.setBindings([]);
+      computePass.setBindings({});
 
       computePass.dispatch(x, y, z);
     } finally {
@@ -230,9 +242,11 @@ export class Computation {
     this.shaderInputs = shaderInputs;
     this._uniformStore = new UniformStore(this.shaderInputs.modules);
     // Create uniform buffer bindings for all modules
-    for (const moduleName of Object.keys(this.shaderInputs.modules)) {
-      const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
-      this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
+    for (const [moduleName, module] of Object.entries(this.shaderInputs.modules)) {
+      if (shaderModuleHasUniforms(module)) {
+        const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
+        this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
+      }
     }
   }
 
@@ -341,7 +355,7 @@ export class Computation {
 
   // TODO - fix typing of luma data types
   _getBufferOrConstantValues(attribute: Buffer | TypedArray, dataType: any): string {
-    const TypedArrayConstructor = getTypedArrayConstructor(dataType);
+    const TypedArrayConstructor = dataTypeDecoder.getTypedArrayConstructor(dataType);
     const typedArray =
       attribute instanceof Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
     return typedArray.toString();

package/src/dynamic-texture/dynamic-texture.ts

@@ -1,9 +1,16 @@
 // luma.gl, MIT license
 // Copyright (c) vis.gl contributors
 
-import type {TextureProps, SamplerProps, TextureView, Device, TextureFormat} from '@luma.gl/core';
+import type {
+  TextureProps,
+  SamplerProps,
+  TextureView,
+  Device,
+  TextureFormat,
+  TextureReadOptions
+} from '@luma.gl/core';
 
-import {Texture, Sampler, log} from '@luma.gl/core';
+import {Buffer, Texture, Sampler, log} from '@luma.gl/core';
 
 // import {loadImageBitmap} from '../application-utils/load-file';
 import {uid} from '../utils/uid';
@@ -140,7 +147,14 @@ export class DynamicTexture {
 
       const propsWithSyncData = await this._loadAllData(originalPropsWithAsyncData);
       this._checkNotDestroyed();
-      const subresources = propsWithSyncData.data ? getTextureSubresources(propsWithSyncData) : [];
+      const subresources = propsWithSyncData.data
+        ? getTextureSubresources({
+            ...propsWithSyncData,
+            width: originalPropsWithAsyncData.width,
+            height: originalPropsWithAsyncData.height,
+            format: originalPropsWithAsyncData.format
+          })
+        : [];
       const userProvidedFormat =
         'format' in originalPropsWithAsyncData && originalPropsWithAsyncData.format !== undefined;
       const userProvidedUsage =
@@ -233,7 +247,6 @@ export class DynamicTexture {
     } catch (e) {
       const err = e instanceof Error ? e : new Error(String(e));
       this.rejectReady(err);
-      throw err;
     }
   }
 
@@ -265,6 +278,59 @@ export class DynamicTexture {
     this._sampler = s;
   }
 
+  /**
+   * Copies texture contents into a GPU buffer and waits until the copy is complete.
+   * The caller owns the returned buffer and must destroy it when finished.
+   */
+  async readBuffer(options: TextureReadOptions = {}): Promise<Buffer> {
+    if (!this.isReady) {
+      await this.ready;
+    }
+
+    const width = options.width ?? this.texture.width;
+    const height = options.height ?? this.texture.height;
+    const depthOrArrayLayers = options.depthOrArrayLayers ?? this.texture.depth;
+    const layout = this.texture.computeMemoryLayout({width, height, depthOrArrayLayers});
+
+    const buffer = this.device.createBuffer({
+      byteLength: layout.byteLength,
+      usage: Buffer.COPY_DST | Buffer.MAP_READ
+    });
+
+    this.texture.readBuffer(
+      {
+        ...options,
+        width,
+        height,
+        depthOrArrayLayers
+      },
+      buffer
+    );
+
+    const fence = this.device.createFence();
+    await fence.signaled;
+    fence.destroy();
+
+    return buffer;
+  }
+
+  /** Reads texture contents back to CPU memory. */
+  async readAsync(options: TextureReadOptions = {}): Promise<ArrayBuffer> {
+    if (!this.isReady) {
+      await this.ready;
+    }
+
+    const width = options.width ?? this.texture.width;
+    const height = options.height ?? this.texture.height;
+    const depthOrArrayLayers = options.depthOrArrayLayers ?? this.texture.depth;
+    const layout = this.texture.computeMemoryLayout({width, height, depthOrArrayLayers});
+
+    const buffer = await this.readBuffer(options);
+    const data = await buffer.readAsync(0, layout.byteLength);
+    buffer.destroy();
+    return data.buffer;
+  }
+
   /**
    * Resize by cloning the underlying immutable texture.
    * Does not copy contents; caller may need to re-upload and/or regenerate mips.
@@ -430,16 +496,22 @@ type TextureSubresourceAnalysis = {
 };
 
 // Flatten dimension-specific texture data into one list of uploadable subresources.
-function getTextureSubresources(props: TextureDataProps): TextureSubresource[] {
+function getTextureSubresources(
+  props: TextureDataProps & Partial<Pick<TextureProps, 'width' | 'height' | 'format'>>
+): TextureSubresource[] {
   if (!props.data) {
     return [];
   }
 
+  const baseLevelSize =
+    props.width && props.height ? {width: props.width, height: props.height} : undefined;
+  const textureFormat = 'format' in props ? props.format : undefined;
+
   switch (props.dimension) {
     case '1d':
       return getTexture1DSubresources(props.data);
     case '2d':
-      return getTexture2DSubresources(0, props.data);
+      return getTexture2DSubresources(0, props.data, baseLevelSize, textureFormat);
     case '3d':
       return getTexture3DSubresources(props.data);
     case '2d-array':
@@ -618,7 +690,7 @@ async function awaitAllPromises(x: any): Promise<any> {
   }
   if (x && typeof x === 'object' && x.constructor === Object) {
     const object: Record<string, any> = x;
-    const values = await Promise.all(Object.values(object));
+    const values = await Promise.all(Object.values(object).map(awaitAllPromises));
     const keys = Object.keys(object);
     const resolvedObject: Record<string, any> = {};
     for (let i = 0; i < keys.length; i++) {

package/src/dynamic-texture/texture-data.ts

@@ -176,8 +176,8 @@ function getTextureMipLevelSize(data: TextureMipLevelData): {width: number; heig
   throw new Error('Unsupported mip-level data');
 }
 
-/** Type guard: is a mip-level `TextureImageData` (vs ExternalImage) */
-function isTextureImageData(data: TextureMipLevelData): data is TextureImageData {
+/** Type guard: is a mip-level `TextureImageData` (vs ExternalImage or bare typed array) */
+function isTextureImageData(data: unknown): data is TextureImageData {
   return (
     typeof data === 'object' &&
     data !== null &&
@@ -187,6 +187,10 @@ function isTextureImageData(data: TextureMipLevelData): data is TextureImageData
   );
 }
 
+function isTypedArrayMipLevelData(data: unknown): data is TypedArray {
+  return ArrayBuffer.isView(data);
+}
+
 export function resolveTextureImageFormat(data: TextureImageData): TextureFormat | undefined {
   const {textureFormat, format} = data;
   if (textureFormat && format && textureFormat !== format) {
@@ -235,14 +239,18 @@ export function getTexture1DSubresources(data: Texture1DData): TextureSubresourc
 }
 
 /** Normalize 2D layer payload into an array of mip-level items */
-function _normalizeTexture2DData(data: Texture2DData): (TextureImageData | ExternalImage)[] {
+function _normalizeTexture2DData(
+  data: Texture2DData
+): (TextureImageData | ExternalImage | TypedArray)[] {
   return Array.isArray(data) ? data : [data];
 }
 
 /** Experimental: Set multiple mip levels (2D), optionally at `z` (depth/array index) */
 export function getTexture2DSubresources(
   slice: number,
-  lodData: Texture2DData
+  lodData: Texture2DData,
+  baseLevelSize?: {width: number; height: number},
+  textureFormat?: TextureFormat
 ): TextureSubresource[] {
   const lodArray = _normalizeTexture2DData(lodData);
   const z = slice;
@@ -266,6 +274,19 @@ export function getTexture2DSubresources(
         z,
         mipLevel
       });
+    } else if (isTypedArrayMipLevelData(imageData) && baseLevelSize) {
+      subresources.push({
+        type: 'texture-data',
+        data: {
+          data: imageData,
+          width: Math.max(1, baseLevelSize.width >> mipLevel),
+          height: Math.max(1, baseLevelSize.height >> mipLevel),
+          ...(textureFormat ? {format: textureFormat} : {})
+        },
+        textureFormat,
+        z,
+        mipLevel
+      });
     } else {
       throw new Error('Unsupported 2D mip-level payload');
     }

package/src/geometry/gpu-geometry.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {PrimitiveTopology, BufferLayout} from '@luma.gl/core';
-import {Device, Buffer, getVertexFormatFromAttribute} from '@luma.gl/core';
+import {Device, Buffer, vertexFormatDecoder} from '@luma.gl/core';
 import type {Geometry} from '../geometry/geometry';
 import {uid} from '../utils/uid';
 
@@ -127,8 +127,13 @@ export function getAttributeBuffersFromGeometry(
         id: `${attributeName}-buffer`
       });
       const {value, size, normalized} = attribute;
-      // @ts-expect-error
-      bufferLayout.push({name, format: getVertexFormatFromAttribute(value, size, normalized)});
+      if (size === undefined) {
+        throw new Error(`Attribute ${attributeName} is missing a size`);
+      }
+      bufferLayout.push({
+        name,
+        format: vertexFormatDecoder.getVertexFormatFromAttribute(value, size, normalized)
+      });
     }
   }
 

package/src/index.ts

@@ -19,6 +19,10 @@ export {makeAnimationLoop} from './animation-loop/make-animation-loop';
 
 export type {ModelProps} from './model/model';
 export {Model} from './model/model';
+export type {MaterialProps} from './material/material';
+export {Material} from './material/material';
+export type {MaterialFactoryProps} from './material/material-factory';
+export {MaterialFactory} from './material/material-factory';
 
 // Transforms
 export type {BufferTransformProps} from './compute/buffer-transform';
@@ -26,14 +30,20 @@ export {BufferTransform} from './compute/buffer-transform';
 export type {TextureTransformProps} from './compute/texture-transform';
 export {TextureTransform} from './compute/texture-transform';
 
-export {PipelineFactory} from './factories/pipeline-factory';
-export {ShaderFactory} from './factories/shader-factory';
-
 // Models
 export type {ClipSpaceProps} from './models/clip-space';
 export {ClipSpace} from './models/clip-space';
 export type {BackgroundTextureModelProps} from './models/billboard-texture-model';
 export {BackgroundTextureModel} from './models/billboard-texture-model';
+export type {
+  BaseLightModelProps,
+  PointLightModelProps,
+  SpotLightModelProps,
+  DirectionalLightModelProps
+} from './models/light-model-utils';
+export {PointLightModel} from './models/point-light-model';
+export {SpotLightModel} from './models/spot-light-model';
+export {DirectionalLightModel} from './models/directional-light-model';
 
 // Scenegraph Core nodes
 export {ScenegraphNode} from './scenegraph/scenegraph-node';
@@ -94,7 +104,21 @@ export type {
 export type {DynamicTextureProps} from './dynamic-texture/dynamic-texture';
 export {DynamicTexture} from './dynamic-texture/dynamic-texture';
 
-export {PickingManager} from './modules/picking/picking-manager';
+export type {
+  PickInfo,
+  PickingMode,
+  ResolvedPickingMode,
+  PickingBackend,
+  PickingManagerProps,
+  ResolvedPickingBackend
+} from './modules/picking/picking-manager';
+export {
+  PickingManager,
+  supportsIndexPicking,
+  resolvePickingMode,
+  resolvePickingBackend
+} from './modules/picking/picking-manager';
+export {picking} from './modules/picking/picking';
 export {picking as indexPicking} from './modules/picking/index-picking';
 export {picking as colorPicking} from './modules/picking/color-picking';
 
@@ -106,6 +130,7 @@ export {
 // DEPRECATED
 
 export {LegacyPickingManager} from './modules/picking/legacy-picking-manager';
+export {legacyColorPicking} from './modules/picking/legacy-color-picking';
 
 import {DynamicTexture, type DynamicTextureProps} from './dynamic-texture/dynamic-texture';
 /** @deprecated use DynamicTexture */