@luma.gl/core 9.1.0-beta.8 → 9.1.0

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

@@ -7,13 +7,10 @@ import type {UniformValue} from '../types/uniforms';
 import type {PrimitiveTopology, RenderPipelineParameters} from '../types/parameters';
 import type {ShaderLayout, Binding} from '../types/shader-layout';
 import type {BufferLayout} from '../types/buffer-layout';
-import type {
-  ColorTextureFormat,
-  DepthStencilTextureFormat
-} from '@luma.gl/core/gpu-type-utils/texture-formats';
+// import {normalizeAttributeMap} from '../helpers/attribute-bindings';
+import {Resource, ResourceProps} from './resource';
 import type {Shader} from './shader';
 import type {RenderPass} from './render-pass';
-import {Resource, ResourceProps} from './resource';
 import {VertexArray} from './vertex-array';
 import {TransformFeedback} from './transform-feedback';
 
@@ -40,18 +37,15 @@ export type RenderPipelineProps = ResourceProps & {
 
   /** Determines how vertices are read from the 'vertex' attributes */
   topology?: PrimitiveTopology;
-
-  // color attachment information (needed on WebGPU)
-
-  /** Color attachments expected by this pipeline. Defaults to [device.preferredColorFormat]. Array needs not be contiguous. */
-  colorAttachmentFormats?: (ColorTextureFormat | null)[];
-  /** Depth attachment expected by this pipeline (if depth parameters are specified). Defaults to device.preferredDepthFormat */
-  depthStencilAttachmentFormat?: DepthStencilTextureFormat;
-
   /** Parameters that are controlled by pipeline */
   parameters?: RenderPipelineParameters;
 
-  // Dynamic bindings (TODO - pipelines should be immutable, move to RenderPass)
+  // /** Use instanced rendering? */
+  // isInstanced?: boolean;
+  // /** Number of instances */
+  // instanceCount?: number;
+  // /** Number of vertices */
+  // vertexCount?: number;
 
   /** Buffers, Textures, Samplers for the shader bindings */
   bindings?: Record<string, Binding>;
@@ -77,12 +71,12 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
     shaderLayout: null,
     bufferLayout: [],
     topology: 'triangle-list',
-
-    colorAttachmentFormats: undefined!,
-    depthStencilAttachmentFormat: undefined!,
-
     parameters: {},
 
+    // isInstanced: false,
+    // instanceCount: 0,
+    // vertexCount: 0,
+
     bindings: {},
     uniforms: {}
   };

package/src/adapter/resources/vertex-array.ts

@@ -10,14 +10,12 @@ import {
 import type {Device} from '../device';
 import type {Buffer} from './buffer';
 import type {RenderPass} from './render-pass';
+import type {RenderPipeline} from './render-pipeline';
 import {Resource, ResourceProps} from './resource';
-import {ShaderLayout} from '../types/shader-layout';
-import {BufferLayout} from '../types/buffer-layout';
 
 /** Properties for initializing a VertexArray */
 export type VertexArrayProps = ResourceProps & {
-  shaderLayout: ShaderLayout;
-  bufferLayout: BufferLayout[];
+  renderPipeline: RenderPipeline | null;
 };
 
 /**
@@ -30,8 +28,7 @@ export type VertexArrayProps = ResourceProps & {
 export abstract class VertexArray extends Resource<VertexArrayProps> {
   static override defaultProps: Required<VertexArrayProps> = {
     ...Resource.defaultProps,
-    shaderLayout: undefined!,
-    bufferLayout: []
+    renderPipeline: null
   };
 
   override get [Symbol.toStringTag](): string {
@@ -52,9 +49,13 @@ export abstract class VertexArray extends Resource<VertexArrayProps> {
     super(device, props, VertexArray.defaultProps);
     this.maxVertexAttributes = device.limits.maxVertexAttributes;
     this.attributes = new Array(this.maxVertexAttributes).fill(null);
+    const {shaderLayout, bufferLayout} = props.renderPipeline || {};
+    if (!shaderLayout || !bufferLayout) {
+      throw new Error('VertexArray');
+    }
     this.attributeInfos = getAttributeInfosByLocation(
-      props.shaderLayout,
-      props.bufferLayout,
+      shaderLayout,
+      bufferLayout,
       this.maxVertexAttributes
     );
   }

package/src/gpu-type-utils/texture-format-table.ts

@@ -117,7 +117,7 @@ const TEXTURE_FORMAT_TABLE: Readonly<Record<TextureFormat, TextureFormatDefiniti
   'rgb9e5ufloat': {channels: 'rgb', packed: true, render: rgb9e5ufloat_renderable}, // , filter: true},
   'rg11b10ufloat': {channels: 'rgb', bitsPerChannel: [11, 11, 10, 0], packed: true, p: 1,render: float32_renderable},
   'rgb10a2unorm': {channels: 'rgba',  bitsPerChannel: [10, 10, 10, 2], packed: true, p: 1},
-  'rgb10a2uint': {channels: 'rgba',  bitsPerChannel: [10, 10, 10, 2], packed: true, p: 1},
+  'rgb10a2uint-webgl': {channels: 'rgba', bitsPerChannel: [10, 10, 10, 2], packed: true, p: 1, wgpu: false},
 
   // 48-bit formats
   'rgb16unorm-webgl': {f: norm16_renderable}, // rgb not renderable

package/src/gpu-type-utils/texture-formats.ts

@@ -54,7 +54,6 @@ export type WebGPUColorTextureFormat =
   // Packed 32-bit formats
   | 'rgb9e5ufloat'
   | 'rgb10a2unorm'
-  | 'rgb10a2uint'
   | 'rg11b10ufloat'
 
   // 64-bit formats
@@ -144,7 +143,7 @@ export type WebGL2ColorTextureFormat =
   | 'rgb8snorm-webgl'
   | 'rg16unorm-webgl'
   | 'rg16snorm-webgl'
-  | 'rgb10a2uint'
+  | 'rgb10a2uint-webgl'
   | 'rgb16unorm-webgl'
   | 'rgb16snorm-webgl'
   | 'rgba16unorm-webgl'