@luma.gl/webgl 9.0.0-alpha.29 → 9.0.0-alpha.30

package/src/adapter/helpers/get-shader-layout.ts

@@ -10,8 +10,8 @@ import type {
   AccessorObject,
   BufferMapping,
   VertexFormat
-} from '@luma.gl/api';
-import {log} from '@luma.gl/api';
+} from '@luma.gl/core';
+import {log} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isWebGL2} from '../../context/context/webgl-checks';
 import {Accessor} from '../../classic/accessor'; // TODO - should NOT depend on classic API
@@ -429,7 +429,7 @@ function parseUniformName(name: string): {name: string; length: number; isArray:
 
 /**
  * TODO - verify this is a copy of above and delete
- * import type {TextureFormat} from '@luma.gl/api';
+ * import type {TextureFormat} from '@luma.gl/core';
 * Extract info about all "active" uniform blocks
  * ("Active" just means that unused (inactive) blocks may have been optimized away during linking)
  *

package/src/adapter/helpers/parse-shader-compiler-log.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import type {CompilerMessage} from '@luma.gl/api';
+import type {CompilerMessage} from '@luma.gl/core';
 
 const MESSAGE_TYPES = ['warning', 'error', 'info'];
 

package/src/adapter/helpers/set-uniform.ts

@@ -9,7 +9,7 @@ export function setUniform(
   gl: WebGLRenderingContext,
   location: WebGLUniformLocation,
   type: GL,
-  value: number | Float32Array | Int32Array | Uint32Array
+  value: number | Float32Array | Int32Array | Uint32Array | boolean
 ): void {
   const gl2 = gl as WebGL2RenderingContext;
 
@@ -37,13 +37,12 @@ export function setUniform(
     }
   }
 
-  // @ts-expect-error
   if (value === true) {
     value = 1;
   }
-  // @ts-expect-error
+
   if (value === false) {
-    value = 1;
+    value = 0;
   }
   const arrayValue = (typeof value === 'number') ? [value] : value;
 

package/src/adapter/helpers/uniforms.ts

@@ -1,4 +1,4 @@
-import {UniformFormat, VertexFormat} from '@luma.gl/api';
+import {UniformFormat, VertexFormat} from '@luma.gl/core';
 import {GL, GLUniformType, GLSamplerType, GLCompositeType, GLDataType} from '@luma.gl/constants';
 
 /** Check is uniform is of sampler type */

package/src/adapter/objects/constants-to-keys.ts

@@ -1,4 +1,4 @@
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 // Resolve a WebGL enumeration name (returns itself if already a number)

package/src/adapter/objects/webgl-renderbuffer.ts

@@ -1,4 +1,4 @@
-import {assert, ResourceProps, TextureFormat} from '@luma.gl/api';
+import {assert, ResourceProps, TextureFormat} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {WebGLDevice} from '../webgl-device';
 import {WebGLResource} from './webgl-resource';

package/src/adapter/objects/webgl-resource.ts

@@ -1,6 +1,6 @@
 // luma.gl, MIT license
-import {Resource, assert, uid, stubRemovedMethods} from '@luma.gl/api';
-import type {Device, ResourceProps} from '@luma.gl/api';
+import {Resource, assert, uid, stubRemovedMethods} from '@luma.gl/core';
+import type {Device, ResourceProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isWebGL2, assertWebGLContext} from '../../context/context/webgl-checks';
 import {WebGLDevice} from '../webgl-device';

package/src/adapter/objects/webgl-vertex-array-object.ts

@@ -1,5 +1,5 @@
-import type {Device, Buffer, ResourceProps, TypedArray, NumericArray} from '@luma.gl/api';
-import {Resource, assert, getScratchArray, fillArray} from '@luma.gl/api';
+import type {Device, Buffer, ResourceProps, TypedArray, NumericArray} from '@luma.gl/core';
+import {Resource, assert, getScratchArray, fillArray} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getBrowser} from '@probe.gl/env';
 

package/src/adapter/resources/webgl-buffer.ts

@@ -1,5 +1,5 @@
-import type {BufferProps} from '@luma.gl/api';
-import {Buffer, assert} from '@luma.gl/api';
+import type {BufferProps} from '@luma.gl/core';
+import {Buffer, assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {WebGLDevice} from '../webgl-device';
 

package/src/adapter/resources/webgl-command-buffer.ts

@@ -5,13 +5,13 @@ import type {
   CopyBufferToTextureOptions,
   CopyTextureToBufferOptions,
   CopyTextureToTextureOptions
-} from '@luma.gl/api';
+} from '@luma.gl/core';
 import {
   CommandBuffer,
   Texture,
   // Buffer,
   Framebuffer
-} from '@luma.gl/api';
+} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 // import {getTypedArrayFromGLType, getGLTypeFromTypedArray} from '../../classic/typed-array-utils';

package/src/adapter/resources/webgl-command-encoder.ts

@@ -1,10 +1,10 @@
-import {CommandEncoder, CommandEncoderProps} from '@luma.gl/api';
+import {CommandEncoder, CommandEncoderProps} from '@luma.gl/core';
 import type {
   CopyBufferToBufferOptions,
   CopyBufferToTextureOptions,
   CopyTextureToBufferOptions,
   CopyTextureToTextureOptions
-} from '@luma.gl/api';
+} from '@luma.gl/core';
 
 import {WEBGLCommandBuffer} from './webgl-command-buffer';
 import {WebGLDevice} from '../webgl-device';

package/src/adapter/resources/webgl-framebuffer.ts

@@ -1,7 +1,7 @@
 // luma.gl, MIT license
 
-import type {FramebufferProps, TextureFormat} from '@luma.gl/api';
-import {Framebuffer, Texture, assert} from '@luma.gl/api';
+import type {FramebufferProps, TextureFormat} from '@luma.gl/core';
+import {Framebuffer, Texture, assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLTexture} from './webgl-texture';

package/src/adapter/resources/webgl-render-pass.ts

@@ -1,4 +1,4 @@
-import {RenderPass, RenderPassProps, NumericArray, RenderPassParameters} from '@luma.gl/api';
+import {RenderPass, RenderPassProps, NumericArray, RenderPassParameters} from '@luma.gl/core';
 import {WebGLDevice} from '../webgl-device';
 import {GL, GLParameters} from '@luma.gl/constants';
 import {withParameters} from '../../context/state-tracker/with-parameters';
@@ -64,8 +64,14 @@ export class WEBGLRenderPass extends RenderPass {
 
     // Map the four renderpass parameters to WebGL parameters
     if (parameters.viewport) {
-      glParameters.viewport = parameters.viewport;
-      glParameters.depthRange = [parameters.viewport[4], parameters.viewport[5]];
+      // WebGPU viewports are 6 coordinates (X, Y, Z)
+      if (parameters.viewport.length >= 6) {
+        glParameters.viewport = parameters.viewport.slice(0, 4);
+        glParameters.depthRange = [parameters.viewport[4], parameters.viewport[5]];
+      } else {
+        // WebGL viewports are 4 coordinates (X, Y)
+        glParameters.viewport = parameters.viewport;
+      }
     }
     glParameters.scissorTest = Boolean(parameters.scissorRect);
     if (parameters.scissorRect) {

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

@@ -9,8 +9,8 @@ import type {
   AttributeLayout,
   TypedArray,
   BufferMapping
-} from '@luma.gl/api';
-import {RenderPipeline, cast, log, decodeVertexFormat} from '@luma.gl/api';
+} from '@luma.gl/core';
+import {RenderPipeline, cast, log, decodeVertexFormat} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 import {getWebGLDataType} from '../converters/texture-formats';
@@ -120,7 +120,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         continue; // eslint-disable-line no-continue
       }
       const decoded = decodeVertexFormat(attribute.format);
-      const {type: typeString, components: size, byteLength: stride, normalized, integer} = decoded;
+      const {type: typeString, components: size, byteLength: stride, normalized /* , integer*/} = decoded;
       const divisor = attribute.stepMode === 'instance' ? 1 : 0;
       const type = getWebGLDataType(typeString);
       this.vertexArrayObject.setBuffer(attribute.location, webglBuffer, {
@@ -129,7 +129,12 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         stride,
         offset: 0,
         normalized,
-        integer,
+        // it is the shader attribute declaration, not the vertex memory format, 
+        // that determines if the data in the buffer will be treated as integers.
+        // /
+        // Also note that WebGL supports assigning non-normalized integer data to floating point attributes,
+        // but as far as we can tell, WebGPU does not.
+        integer: false,
         divisor
       });
     }
@@ -437,10 +442,10 @@ function getDrawMode(
     case 'point-list': return GL.POINTS;
     case 'line-list': return GL.LINES;
     case 'line-strip': return GL.LINE_STRIP;
-    case 'line-loop': return GL.LINE_LOOP;
+    case 'line-loop-webgl': return GL.LINE_LOOP;
     case 'triangle-list': return GL.TRIANGLES;
     case 'triangle-strip': return GL.TRIANGLE_STRIP;
-    case 'triangle-fan': return GL.TRIANGLE_FAN;
+    case 'triangle-fan-webgl': return GL.TRIANGLE_FAN;
     default: throw new Error(topology);
   }
 }
@@ -452,10 +457,10 @@ function getGLPrimitive(topology: PrimitiveTopology): GL.POINTS | GL.LINES | GL.
     case 'point-list': return GL.POINTS;
     case 'line-list': return GL.LINES;
     case 'line-strip': return GL.LINES;
-    case 'line-loop': return GL.LINES;
+    case 'line-loop-webgl': return GL.LINES;
     case 'triangle-list': return GL.TRIANGLES;
     case 'triangle-strip': return GL.TRIANGLES;
-    case 'triangle-fan': return GL.TRIANGLES;
+    case 'triangle-fan-webgl': return GL.TRIANGLES;
     default: throw new Error(topology);
   }
 }

package/src/adapter/resources/webgl-sampler.ts

@@ -1,6 +1,6 @@
 // luma.gl, MIT license
 
-import {Sampler, SamplerProps} from '@luma.gl/api';
+import {Sampler, SamplerProps} from '@luma.gl/core';
 import {GL, GLSamplerParameters} from '@luma.gl/constants';
 import {convertSamplerParametersToWebGL} from '../converters/sampler-parameters';
 import type {WebGLDevice} from '../webgl-device';

package/src/adapter/resources/webgl-shader.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import {log, uid, Shader, ShaderProps, CompilerMessage, formatCompilerLog} from '@luma.gl/api';
+import {log, uid, Shader, ShaderProps, CompilerMessage, formatCompilerLog} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getShaderInfo} from '../helpers/get-shader-info';
 import {parseShaderCompilerLog} from '../helpers/parse-shader-compiler-log';

package/src/adapter/resources/webgl-texture.ts

@@ -12,8 +12,8 @@ import {
   SamplerParameters,
   TypedArray,
   isObjectEmpty
-} from '@luma.gl/api';
-import {Texture, cast, log, assert, isPowerOfTwo, loadImage} from '@luma.gl/api';
+} from '@luma.gl/core';
+import {Texture, cast, log, assert, isPowerOfTwo, loadImage} from '@luma.gl/core';
 import {GL, GLSamplerParameters} from '@luma.gl/constants';
 import {withParameters} from '../../context/state-tracker/with-parameters';
 import {

package/src/adapter/webgl-canvas-context.ts

@@ -1,6 +1,6 @@
 // luma.gl, MIT license
-import type {CanvasContextProps} from '@luma.gl/api';
-import {CanvasContext} from '@luma.gl/api';
+import type {CanvasContextProps} from '@luma.gl/core';
+import {CanvasContext} from '@luma.gl/core';
 import {WebGLDevice} from './webgl-device';
 import {WEBGLFramebuffer} from './resources/webgl-framebuffer';
 

package/src/adapter/webgl-device.ts

@@ -6,8 +6,8 @@ import type {
   DeviceFeature,
   CanvasContextProps,
   TextureFormat
-} from '@luma.gl/api';
-import {Device, CanvasContext, log, uid} from '@luma.gl/api';
+} from '@luma.gl/core';
+import {Device, CanvasContext, log, uid} from '@luma.gl/core';
 import {isBrowser} from '@probe.gl/env';
 import {polyfillContext} from '../context/polyfill/polyfill-context';
 import {popContextState, pushContextState, trackContextState} from '../context/state-tracker/track-context-state';
@@ -48,7 +48,7 @@ import type {
   ComputePassProps,
   // CommandEncoder,
   CommandEncoderProps
-} from '@luma.gl/api';
+} from '@luma.gl/core';
 
 import {BufferWithAccessor} from '../classic/buffer-with-accessor';
 import {WEBGLBuffer} from './resources/webgl-buffer';

package/src/classic/accessor.ts

@@ -1,4 +1,4 @@
-import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/api';
+import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getTypedArrayFromGLType} from './typed-array-utils';
 

package/src/classic/buffer-with-accessor.ts

@@ -1,7 +1,7 @@
 // luma.gl, MIT license
 
-import type {Device, BufferProps, TypedArray} from '@luma.gl/api';
-import {assert, checkProps} from '@luma.gl/api';
+import type {Device, BufferProps, TypedArray} from '@luma.gl/core';
+import {assert, checkProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {assertWebGL2Context} from '../context/context/webgl-checks';
 import {AccessorObject} from '../types';

package/src/classic/clear.ts

@@ -1,4 +1,4 @@
-import {Device, Framebuffer, assert} from '@luma.gl/api';
+import {Device, Framebuffer, assert} from '@luma.gl/core';
 import {WebGLDevice} from '../adapter/webgl-device';
 import {withParameters} from '../context/state-tracker/with-parameters';
 

package/src/classic/copy-and-blit.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import {assert, Texture, Framebuffer, FramebufferProps} from '@luma.gl/api';
+import {assert, Texture, Framebuffer, FramebufferProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 import {BufferWithAccessor as Buffer} from './buffer-with-accessor';

package/src/classic/format-utils.ts

@@ -1,4 +1,4 @@
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 // Returns number of components in a specific readPixels WebGL format

package/src/classic/typed-array-utils.ts

@@ -1,6 +1,6 @@
 // luma.gl, MIT license
 
-import {TypedArray, TypedArrayConstructor} from '@luma.gl/api';
+import {TypedArray, TypedArrayConstructor} from '@luma.gl/core';
 import {GL, GLDataType, GLPixelType} from '@luma.gl/constants';
 
 const ERR_TYPE_DEDUCTION = 'Failed to deduce GL constant from typed array';

package/src/context/context/webgl-checks.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 
 const ERR_CONTEXT = 'Invalid WebGLRenderingContext';
 export const ERR_WEBGL = ERR_CONTEXT;

package/src/context/debug/spector.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import {log, loadScript} from '@luma.gl/api';
+import {log, loadScript} from '@luma.gl/core';
 
 /** Spector debug initialization options */
 type SpectorProps = {

package/src/context/debug/webgl-developer-tools.ts

@@ -1,5 +1,5 @@
 // luma.gl, MIT license
-import {log, loadScript} from '@luma.gl/api';
+import {log, loadScript} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isBrowser} from '@probe.gl/env'
 

package/src/context/parameters/unified-parameter-api.ts

@@ -1,7 +1,7 @@
 // Provides a unified API for getting and setting any WebGL parameter
 // Also knows default values of all parameters, enabling fast cache initialization
 // Provides base functionality for the state caching.
-import {Device} from '@luma.gl/api';
+import {Device} from '@luma.gl/core';
 import type {GLParameters} from '@luma.gl/constants';
 import {
   GL_PARAMETER_DEFAULTS,

package/src/context/polyfill/polyfill-context.ts

@@ -7,7 +7,7 @@
 // This is intended to be a stand-alone file with minimal dependencies,
 // easy to reuse or repurpose in other projects.
 
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 import {polyfillVertexArrayObject} from './polyfill-vertex-array-object';
 
 import {WEBGL2_CONTEXT_POLYFILLS, WEBGL2_CONTEXT_OVERRIDES} from './polyfill-table';

package/src/context/polyfill/polyfill-table.ts

@@ -1,4 +1,4 @@
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isWebGL2} from '../context/webgl-checks';
 

package/src/context/state-tracker/track-context-state.ts

@@ -1,6 +1,6 @@
 // Support for listening to context state changes and intercepting state queries
 // NOTE: this system does not handle buffer bindings
-import {assert} from '@luma.gl/api';
+import {assert} from '@luma.gl/core';
 import {GL_PARAMETER_DEFAULTS, GL_HOOKED_SETTERS, NON_CACHE_PARAMETERS} from '../parameters/webgl-parameter-tables';
 import {setParameters, getParameters} from '../parameters/unified-parameter-api';
 import {deepArrayEqual} from './deep-array-equal';

package/src/context/state-tracker/with-parameters.ts

@@ -1,4 +1,4 @@
-import type {Device} from '@luma.gl/api';
+import type {Device} from '@luma.gl/core';
 import {WebGLDevice} from '../../adapter/webgl-device';
 import {GLParameters, setParameters} from '../parameters/unified-parameter-api';
 import {pushContextState, popContextState} from './track-context-state';

package/src/index.ts

@@ -33,7 +33,7 @@ export type {RenderbufferProps} from './adapter/objects/webgl-renderbuffer';
 export {WEBGLRenderbuffer} from './adapter/objects/webgl-renderbuffer';
 export {WEBGLVertexArrayObject} from './adapter/objects/webgl-vertex-array-object';
 
-// WebGL adapter classes (Legacy, will be moved to webgl-legacy)
+// WebGL adapter classes (Legacy will likely be removed)
 export {Accessor} from './classic/accessor';
 export type {AccessorObject} from './types';
 export type {BufferWithAccessorProps} from './classic/buffer-with-accessor';

package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts

@@ -1,12 +0,0 @@
-/// <reference types="dist" />
-import type { ShaderLayout, BufferMapping } from '@luma.gl/api';
-/**
- * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.
- * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array
- * @param layout
- * @param bufferMap The buffer map is optional
- * @returns WebGPU layout intended for a GPURenderPassDescriptor.
- */
-export declare function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMapping[]): GPUVertexBufferLayout[];
-export declare function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[]): Record<string, number>;
-//# sourceMappingURL=get-vertex-buffer-layout.d.ts.map

package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-vertex-buffer-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAkB,MAAM,cAAc,CAAC;AAG/E;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,qBAAqB,EAAE,CAkE/G;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BvG"}

package/dist/adapter/helpers/get-vertex-buffer-layout.js

@@ -1,84 +0,0 @@
-import { decodeVertexFormat } from '@luma.gl/api';
-export function getVertexBufferLayout(layout, bufferMap) {
-  const vertexBufferLayouts = [];
-  const usedAttributes = new Set();
-  for (const mapping of bufferMap) {
-    const vertexAttributes = [];
-    let stepMode = 'vertex';
-    let byteStride = 0;
-    const byteOffset = mapping.byteOffset || 0;
-    if ('attributes' in mapping) {
-      for (const interleaved of mapping.attributes) {
-        const attributeLayout = findAttributeLayout(layout, interleaved.name, usedAttributes);
-        stepMode = attributeLayout.stepMode || 'vertex';
-        vertexAttributes.push({
-          format: attributeLayout.format,
-          offset: byteOffset + byteStride,
-          shaderLocation: attributeLayout.location
-        });
-        byteStride += decodeVertexFormat(attributeLayout.format).byteLength;
-      }
-    } else {
-      const attributeLayout = findAttributeLayout(layout, mapping.name, usedAttributes);
-      byteStride = decodeVertexFormat(attributeLayout.format).byteLength;
-      stepMode = attributeLayout.stepMode || 'vertex';
-      vertexAttributes.push({
-        format: attributeLayout.format,
-        offset: byteOffset,
-        shaderLocation: attributeLayout.location
-      });
-    }
-    vertexBufferLayouts.push({
-      arrayStride: mapping.byteStride || byteStride,
-      stepMode: stepMode || 'vertex',
-      attributes: vertexAttributes
-    });
-  }
-  for (const attribute of layout.attributes) {
-    if (!usedAttributes.has(attribute.name)) {
-      vertexBufferLayouts.push({
-        arrayStride: decodeVertexFormat(attribute.format).byteLength,
-        stepMode: attribute.stepMode || 'vertex',
-        attributes: [{
-          format: attribute.format,
-          offset: 0,
-          shaderLocation: attribute.location
-        }]
-      });
-    }
-  }
-  return vertexBufferLayouts;
-}
-export function getBufferSlots(layout, bufferMap) {
-  const usedAttributes = new Set();
-  let bufferSlot = 0;
-  const bufferSlots = {};
-  for (const mapping of bufferMap) {
-    if ('attributes' in mapping) {
-      for (const interleaved of mapping.attributes) {
-        usedAttributes.add(interleaved.name);
-      }
-    } else {
-      usedAttributes.add(mapping.name);
-    }
-    bufferSlots[mapping.name] = bufferSlot++;
-  }
-  for (const attribute of layout.attributes) {
-    if (!usedAttributes.has(attribute.name)) {
-      bufferSlots[attribute.name] = bufferSlot++;
-    }
-  }
-  return bufferSlots;
-}
-function findAttributeLayout(layout, name, attributeNames) {
-  const attribute = layout.attributes.find(attribute => attribute.name === name);
-  if (!attribute) {
-    throw new Error("Unknown attribute ".concat(name));
-  }
-  if (attributeNames.has(name)) {
-    throw new Error("Duplicate attribute ".concat(name));
-  }
-  attributeNames.add(name);
-  return attribute;
-}
-//# sourceMappingURL=get-vertex-buffer-layout.js.map

package/dist/adapter/helpers/get-vertex-buffer-layout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-vertex-buffer-layout.js","names":["decodeVertexFormat","getVertexBufferLayout","layout","bufferMap","vertexBufferLayouts","usedAttributes","Set","mapping","vertexAttributes","stepMode","byteStride","byteOffset","interleaved","attributes","attributeLayout","findAttributeLayout","name","push","format","offset","shaderLocation","location","byteLength","arrayStride","attribute","has","getBufferSlots","bufferSlot","bufferSlots","add","attributeNames","find","Error","concat"],"sources":["../../../src/adapter/helpers/get-vertex-buffer-layout.ts"],"sourcesContent":["import type {ShaderLayout, BufferMapping, AttributeLayout} from '@luma.gl/api';\nimport {decodeVertexFormat} from '@luma.gl/api';\n\n/**\n * Build a WebGPU vertex buffer layout intended for use in a GPURenderPassDescriptor.\n * Converts luma.gl attribute definitions to a WebGPU GPUVertexBufferLayout[] array\n * @param layout\n * @param bufferMap The buffer map is optional\n * @returns WebGPU layout intended for a GPURenderPassDescriptor.\n */\nexport function getVertexBufferLayout(layout: ShaderLayout, bufferMap: BufferMapping[]): GPUVertexBufferLayout[] {\n  const vertexBufferLayouts: GPUVertexBufferLayout[] = [];\n  const usedAttributes = new Set<string>();\n\n  // First handle any buffers mentioned in `bufferMapping`\n  for (const mapping of bufferMap) {\n    // Build vertex attributes for one buffer\n    const vertexAttributes: GPUVertexAttribute[] = [];\n\n    // TODO verify that all stepModes for one buffer are the same\n    let stepMode: 'vertex' | 'instance' = 'vertex';\n    let byteStride = 0;\n    const byteOffset = mapping.byteOffset || 0;\n\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if ('attributes' in mapping) {\n      // const arrayStride = mapping.byteStride; TODO \n      for (const interleaved of mapping.attributes) {\n        const attributeLayout = findAttributeLayout(layout, interleaved.name, usedAttributes);\n\n        stepMode = attributeLayout.stepMode || 'vertex';\n        vertexAttributes.push({\n          format: attributeLayout.format,\n          offset: byteOffset + byteStride,\n          shaderLocation: attributeLayout.location\n        });\n\n        byteStride += decodeVertexFormat(attributeLayout.format).byteLength;\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      const attributeLayout = findAttributeLayout(layout, mapping.name, usedAttributes);\n      byteStride = decodeVertexFormat(attributeLayout.format).byteLength;\n\n      stepMode = attributeLayout.stepMode || 'vertex';\n      vertexAttributes.push({\n        format: attributeLayout.format,\n        offset: byteOffset,\n        shaderLocation: attributeLayout.location\n      });\n    }\n\n    // Store all the attribute bindings for one buffer\n    vertexBufferLayouts.push({\n      arrayStride: mapping.byteStride || byteStride,\n      stepMode: stepMode || 'vertex',\n      attributes: vertexAttributes\n    });\n  }\n\n  // Add any non-mapped attributes\n  for (const attribute of layout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      vertexBufferLayouts.push({\n        arrayStride: decodeVertexFormat(attribute.format).byteLength,\n        stepMode: attribute.stepMode || 'vertex',\n        attributes: [{\n          format: attribute.format,\n          offset: 0,\n          shaderLocation: attribute.location\n        }]\n      });\n    }\n  }\n\n  return vertexBufferLayouts;\n}\n\nexport function getBufferSlots(layout: ShaderLayout, bufferMap: BufferMapping[]): Record<string, number> {\n  const usedAttributes = new Set<string>();\n  let bufferSlot = 0;\n  const bufferSlots: Record<string, number> = {};\n\n  // First handle any buffers mentioned in `bufferMapping`\n  for (const mapping of bufferMap) {\n    // interleaved mapping {..., attributes: [{...}, ...]}\n    if ('attributes' in mapping) {\n      for (const interleaved of mapping.attributes) {\n        usedAttributes.add(interleaved.name);\n      }\n      // non-interleaved mapping (just set offset and stride)\n    } else {\n      usedAttributes.add(mapping.name);\n    }\n    bufferSlots[mapping.name] = bufferSlot++;\n  }\n\n  // Add any non-mapped attributes\n  for (const attribute of layout.attributes) {\n    if (!usedAttributes.has(attribute.name)) {\n      bufferSlots[attribute.name] = bufferSlot++;\n    }\n  }\n\n  return bufferSlots;\n}\n\n/**\n * Looks up an attribute in the ShaderLayout.\n * @throws if name is not in ShaderLayout\n * @throws if name has already been referenced\n */\nfunction findAttributeLayout(layout: ShaderLayout, name: string, attributeNames: Set<string>): AttributeLayout {\n  const attribute = layout.attributes.find(attribute => attribute.name === name);\n  if (!attribute) {\n    throw new Error(`Unknown attribute ${name}`);\n  }\n  if (attributeNames.has(name)) {\n    throw new Error(`Duplicate attribute ${name}`);\n  }\n  attributeNames.add(name);\n  return attribute;\n}\n"],"mappings":"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"}