@luma.gl/core 9.0.0-beta.6 → 9.0.0-beta.7

package/src/adapter/resources/render-pipeline.ts

@@ -19,15 +19,15 @@ export type RenderPipelineProps = ResourceProps & {
 
   /** Compiled vertex shader */
   vs?: Shader | null;
-  /** Vertex shader entry point (defaults to 'main'). WGSL only */
-  vsEntryPoint?: string; //
-  /** Constants to apply to compiled vertex shader (WGSL only) */
+  /** Name of vertex shader stage main function (defaults to 'main'). WGSL only */
+  vertexEntryPoint?: string; //
+  /** Constant values to apply to compiled vertex shader. Do not require re-compilation. (WGSL only) */
   vsConstants?: Record<string, number>; // WGSL only
   /** Compiled fragment shader */
   fs?: Shader | null;
-  /** Fragment shader entry point (defaults to 'main'). WGSL only */
-  fsEntryPoint?: string; // WGSL only
-  /** Constants to apply to compiled fragment shader (WGSL only) */
+  /** Name of fragment shader stage main function (defaults to 'main'). WGSL only */
+  fragmentEntryPoint?: string; // WGSL only
+  /** Constant values to apply to compiled fragment shader. Do not require re-compilation. (WGSL only) */
   fsConstants?: Record<string, number>;
 
   /** Describes the attributes and bindings exposed by the pipeline shader(s). */
@@ -65,11 +65,11 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
     ...Resource.defaultProps,
 
     vs: null,
-    vsEntryPoint: '', // main
+    vertexEntryPoint: 'vertexMain',
     vsConstants: {},
 
     fs: null,
-    fsEntryPoint: '', // main
+    fragmentEntryPoint: 'fragmentMain',
     fsConstants: {},
 
     shaderLayout: null,
@@ -109,7 +109,7 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
   /** Set bindings (stored on pipeline and set before each call) */
   abstract setBindings(bindings: Record<string, Binding>): void;
 
-  /** Draw call */
+  /** Draw call. Returns false if the draw call was aborted (due to resources still initializing) */
   abstract draw(options: {
     /** Render pass to draw into (targeting screen or framebuffer) */
     renderPass?: RenderPass;
@@ -130,7 +130,7 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
     baseVertex?: number;
     /** Transform feedback. WebGL only. */
     transformFeedback?: TransformFeedback;
-  }): void;
+  }): boolean;
 
   // DEPRECATED METHODS
 

package/src/adapter/resources/shader.ts

@@ -16,8 +16,8 @@ import {getShaderInfo} from '../../lib/compiler-log/get-shader-info';
 export type ShaderProps = ResourceProps & {
   /** Shader language (defaults to auto) */
   language?: 'glsl' | 'wgsl' | 'auto';
-  /** Which stage are we compiling? Required by WebGL and GLSL transpiler */
-  stage: 'vertex' | 'fragment' | 'compute';
+  /** Which stage are we compiling? Required for GLSL. Ignored for WGSL. */
+  stage?: 'vertex' | 'fragment' | 'compute';
   /** Shader source code */
   source: string;
   /** Optional shader source map (WebGPU only) */
@@ -36,7 +36,7 @@ export abstract class Shader extends Resource<ShaderProps> {
   static override defaultProps: Required<ShaderProps> = {
     ...Resource.defaultProps,
     language: 'auto',
-    stage: 'vertex',
+    stage: undefined,
     source: '',
     sourceMap: null,
     entryPoint: 'main',

package/src/adapter/resources/texture.ts

@@ -127,6 +127,10 @@ export abstract class Texture<Props extends TextureProps = TextureProps> extends
   /** Default view for this texture */
   abstract view: TextureView;
 
+  /** "Time" of last update. Monotonically increasing timestamp */
+  updateTimestamp: number;
+
+  /** Do not use directly. Create with device.createTexture() */
   constructor(
     device: Device,
     props: Props,
@@ -138,5 +142,11 @@ export abstract class Texture<Props extends TextureProps = TextureProps> extends
     this.width = this.props.width;
     this.height = this.props.height;
     this.depth = this.props.depth;
+
+    // TODO - perhaps this should be set on async write completion?
+    this.updateTimestamp = device.incrementTimestamp();
   }
+
+  /** Create a texture view for this texture */
+  abstract createView(props?: TextureViewProps): TextureView;
 }

package/src/adapter/types/shader-layout.ts

@@ -35,7 +35,7 @@ import type {TextureView} from '../resources/texture-view';
 export type ShaderLayout = {
   /** All attributes, their locations, and basic type information. Also an auto-deduced step mode */
   attributes: AttributeDeclaration[];
-  /** All bidning points (textures, samplers, uniform buffers) with their locations and type */
+  /** All binding points (textures, samplers, uniform buffers) with their locations and type */
   bindings: BindingDeclaration[];
   /** WebGL only (WebGPU use bindings and uniform buffers) */
   uniforms?: any[];
@@ -43,6 +43,11 @@ export type ShaderLayout = {
   varyings?: VaryingBinding[];
 };
 
+export type ComputeShaderLayout = {
+  /** All binding points (textures, samplers, uniform buffers) with their locations and type */
+  bindings: BindingDeclaration[];
+};
+
 /**
  * Declares one for attributes
  */
@@ -88,7 +93,7 @@ type Binding = {
 /** ShaderLayout for bindings */
 export type BindingDeclaration =
   | UniformBufferBindingLayout
-  | BufferBindingLayout
+  | StorageBufferBindingLayout
   | TextureBindingLayout
   | SamplerBindingLayout
   | StorageTextureBindingLayout;
@@ -112,8 +117,8 @@ export type UniformInfo = {
   byteStride: number;
 };
 
-export type BufferBindingLayout = {
-  type: 'uniform' | 'storage' | 'read-only-storage';
+export type StorageBufferBindingLayout = {
+  type: 'storage' | 'read-only-storage';
   name: string;
   location: number;
   visibility?: number;

package/src/adapter/types/texture-formats.ts

@@ -133,10 +133,9 @@ export type WebGPUColorTextureFormat =
   | 'astc-12x12-unorm-srgb';
 
 /** Unsized texture formats (the only formats supported by WebGL1) */
-export type UnsizedColorTextureFormat =
-  // 'r8unorm-unsized' |
-  // 'ra8unorm-unsized' |
-  'rgb8unorm-unsized' | 'rgba8unorm-unsized';
+export type UnsizedColorTextureFormat = 'rgb8unorm-unsized' | 'rgba8unorm-unsized';
+// 'r8unorm-unsized' |
+// 'ra8unorm-unsized' |
 // 'rgb8unorm-srgb-unsized' |
 // 'rgba8unorm-srgb-unsized'
 

package/src/index.ts

@@ -109,6 +109,7 @@ export type {ColorAttachment, DepthStencilAttachment} from './adapter/types/type
 
 export type {
   ShaderLayout,
+  ComputeShaderLayout,
   AttributeDeclaration,
   BindingDeclaration,
   Binding

package/src/lib/luma.ts

@@ -12,6 +12,11 @@ import {assert} from '../utils/assert';
 
 const deviceList = new Map<string, typeof Device>();
 
+export type CreateDeviceProps = DeviceProps & {
+  /** Select type of device */
+  type?: 'webgl' | 'webgpu' | 'best-available';
+};
+
 /**
  * Entry point to the luma.gl GPU abstraction
  * Register WebGPU and/or WebGL devices (controls application bundle size)
@@ -46,12 +51,12 @@ export class luma {
     );
   }
 
-  static setDefaultDeviceProps(props: DeviceProps): void {
+  static setDefaultDeviceProps(props: CreateDeviceProps): void {
     Object.assign(Device.defaultProps, props);
   }
 
   /** Creates a device. Asynchronously. */
-  static async createDevice(props: DeviceProps = {}): Promise<Device> {
+  static async createDevice(props: CreateDeviceProps = {}): Promise<Device> {
     props = {...Device.defaultProps, ...props};
     if (props.gl) {
       props.type = 'webgl';

package/src/lib/uniforms/uniform-store.ts

@@ -66,7 +66,7 @@ export class UniformStore<
 
   /** Destroy any managed uniform buffers */
   destroy(): void {
-    for (const uniformBuffer of Object.values(this.uniformBuffers)) {
+    for (const uniformBuffer of this.uniformBuffers.values()) {
       uniformBuffer.destroy();
     }
   }