@luma.gl/webgl 9.0.0-alpha.33 → 9.0.0-alpha.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/dist/adapter/converters/device-parameters.js +1 -1
  2. package/dist/adapter/converters/device-parameters.js.map +1 -1
  3. package/dist/adapter/converters/shader-formats.js +3 -3
  4. package/dist/adapter/converters/shader-formats.js.map +1 -1
  5. package/dist/adapter/converters/texture-formats.js +3 -3
  6. package/dist/adapter/converters/texture-formats.js.map +1 -1
  7. package/dist/adapter/converters/vertex-formats.js +3 -3
  8. package/dist/adapter/converters/vertex-formats.js.map +1 -1
  9. package/dist/adapter/device-helpers/device-features.js +1 -1
  10. package/dist/adapter/device-helpers/device-features.js.map +1 -1
  11. package/dist/adapter/helpers/get-shader-layout.js +2 -2
  12. package/dist/adapter/helpers/get-shader-layout.js.map +1 -1
  13. package/dist/adapter/objects/constants-to-keys.js +1 -1
  14. package/dist/adapter/objects/constants-to-keys.js.map +1 -1
  15. package/dist/adapter/objects/webgl-renderbuffer.js +3 -4
  16. package/dist/adapter/objects/webgl-renderbuffer.js.map +1 -1
  17. package/dist/adapter/objects/webgl-resource.js +7 -8
  18. package/dist/adapter/objects/webgl-resource.js.map +1 -1
  19. package/dist/adapter/objects/webgl-vertex-array-object.js +2 -3
  20. package/dist/adapter/objects/webgl-vertex-array-object.js.map +1 -1
  21. package/dist/adapter/resources/webgl-buffer.js +10 -11
  22. package/dist/adapter/resources/webgl-buffer.js.map +1 -1
  23. package/dist/adapter/resources/webgl-command-buffer.js +3 -4
  24. package/dist/adapter/resources/webgl-command-buffer.js.map +1 -1
  25. package/dist/adapter/resources/webgl-command-encoder.js +2 -3
  26. package/dist/adapter/resources/webgl-command-encoder.js.map +1 -1
  27. package/dist/adapter/resources/webgl-framebuffer.js +6 -7
  28. package/dist/adapter/resources/webgl-framebuffer.js.map +1 -1
  29. package/dist/adapter/resources/webgl-render-pass.js +2 -3
  30. package/dist/adapter/resources/webgl-render-pass.js.map +1 -1
  31. package/dist/adapter/resources/webgl-render-pipeline.js +31 -32
  32. package/dist/adapter/resources/webgl-render-pipeline.js.map +1 -1
  33. package/dist/adapter/resources/webgl-sampler.js +4 -5
  34. package/dist/adapter/resources/webgl-sampler.js.map +1 -1
  35. package/dist/adapter/resources/webgl-shader.js +7 -8
  36. package/dist/adapter/resources/webgl-shader.js.map +1 -1
  37. package/dist/adapter/resources/webgl-texture.js +19 -20
  38. package/dist/adapter/resources/webgl-texture.js.map +1 -1
  39. package/dist/adapter/webgl-canvas-context.js +4 -5
  40. package/dist/adapter/webgl-canvas-context.js.map +1 -1
  41. package/dist/adapter/webgl-device.js +25 -24
  42. package/dist/adapter/webgl-device.js.map +1 -1
  43. package/dist/classic/accessor.js +9 -10
  44. package/dist/classic/accessor.js.map +1 -1
  45. package/dist/classic/buffer-with-accessor.js +1 -2
  46. package/dist/classic/buffer-with-accessor.js.map +1 -1
  47. package/dist/classic/copy-and-blit.js +1 -1
  48. package/dist/classic/copy-and-blit.js.map +1 -1
  49. package/dist/context/context/create-browser-context.js +1 -1
  50. package/dist/context/context/create-browser-context.js.map +1 -1
  51. package/dist/context/debug/webgl-developer-tools.js +5 -5
  52. package/dist/context/debug/webgl-developer-tools.js.map +1 -1
  53. package/dist/context/polyfill/polyfill-context.js +1 -1
  54. package/dist/context/polyfill/polyfill-context.js.map +1 -1
  55. package/dist/context/state-tracker/track-context-state.js +8 -9
  56. package/dist/context/state-tracker/track-context-state.js.map +1 -1
  57. package/dist/dist.dev.js +57 -30
  58. package/dist/index.cjs +2 -2
  59. package/dist.min.js +22 -22
  60. package/package.json +5 -5
  61. package/src/adapter/resources/webgl-render-pipeline.ts +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"track-context-state.js","names":["assert","GL_PARAMETER_DEFAULTS","GL_HOOKED_SETTERS","NON_CACHE_PARAMETERS","setParameters","getParameters","deepArrayEqual","GLState","constructor","gl","copyState","log","arguments","length","undefined","_defineProperty","cache","Object","assign","_updateCache","bind","seal","push","values","stateStack","pop","oldValues","valueChanged","oldValue","key","value","cached","getContextState","state","trackContextState","options","enable","installProgramSpy","setter","installSetterSpy","installGetterOverride","glState","pushContextState","popContextState","functionName","originalGetterFunc","get","pname","has","defineProperty","concat","configurable","originalSetterFunc","set","_len","params","Array","_key","originalUseProgram","useProgram","useProgramLuma","handle","program"],"sources":["../../../src/context/state-tracker/track-context-state.ts"],"sourcesContent":["// Support for listening to context state changes and intercepting state queries\n// NOTE: this system does not handle buffer bindings\nimport {assert} from '@luma.gl/core';\nimport {GL_PARAMETER_DEFAULTS, GL_HOOKED_SETTERS, NON_CACHE_PARAMETERS} from '../parameters/webgl-parameter-tables';\nimport {setParameters, getParameters} from '../parameters/unified-parameter-api';\nimport {deepArrayEqual} from './deep-array-equal';\n\n// HELPER CLASS - GLState\n\n/* eslint-disable no-shadow */\nclass GLState {\n gl: WebGLRenderingContext;\n program: unknown = null;\n stateStack: object[] = [];\n enable = true;\n cache: Record<string, any>;\n log;\n\n constructor(\n gl: WebGLRenderingContext,\n {\n copyState = false, // Copy cache from params (slow) or initialize from WebGL defaults (fast)\n log = () => {} // Logging function, called when gl parameter change calls are actually issued\n } = {}\n ) {\n this.gl = gl;\n this.cache = copyState ? getParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);\n this.log = log;\n\n this._updateCache = this._updateCache.bind(this);\n Object.seal(this);\n }\n\n push(values = {}) {\n this.stateStack.push({});\n }\n\n pop() {\n assert(this.stateStack.length > 0);\n // Use the saved values in the state stack to restore parameters\n const oldValues = this.stateStack[this.stateStack.length - 1];\n setParameters(this.gl, oldValues);\n // Don't pop until we have reset parameters (to make sure other \"stack frames\" are not affected)\n this.stateStack.pop();\n }\n\n /**\n // interceptor for context set functions - update our cache and our stack\n // values (Object) - the key values for this setter\n * @param values\n * @returns\n */\n _updateCache(values: {[key: number | string]: any}) {\n let valueChanged = false;\n let oldValue; // = undefined\n\n const oldValues: {[key: number | string]: any} | null = this.stateStack.length > 0 ? this.stateStack[this.stateStack.length - 1] : null;\n\n for (const key in values) {\n assert(key !== undefined);\n const value = values[key];\n const cached = this.cache[key];\n // Check that value hasn't already been shadowed\n if (!deepArrayEqual(value, cached)) {\n valueChanged = true;\n oldValue = cached;\n\n // First, save current value being shadowed\n // If a state stack frame is active, save the current parameter values for pop\n // but first check that value hasn't already been shadowed and saved\n if (oldValues && !(key in oldValues)) {\n oldValues[key] = cached;\n }\n\n // Save current value being shadowed\n this.cache[key] = value;\n }\n }\n\n return {valueChanged, oldValue};\n }\n}\n\nfunction getContextState(gl: WebGLRenderingContext): GLState {\n // @ts-expect-error\n return gl.state as GLState;\n}\n\n// PUBLIC API\n\n/**\n * Initialize WebGL state caching on a context\n * can be called multiple times to enable/disable\n *\n * @note After calling this function, context state will be cached\n * gl.state.push() and gl.state.pop() will be available for saving,\n * temporarily modifying, and then restoring state.\n */\nexport function trackContextState(\n gl: WebGLRenderingContext,\n options?: {\n enable?: boolean;\n copyState?: boolean;\n log?: any;\n }\n): WebGLRenderingContext {\n const {enable = true, copyState} = options;\n assert(copyState !== undefined);\n // @ts-expect-error\n if (!gl.state) {\n // @ts-ignore\n // const {polyfillContext} = global_;\n // if (polyfillContext) {\n // polyfillContext(gl);\n // }\n\n // Create a state cache\n // @ts-expect-error\n gl.state = new GLState(gl, {copyState});\n\n installProgramSpy(gl);\n\n // intercept all setter functions in the table\n for (const key in GL_HOOKED_SETTERS) {\n const setter = GL_HOOKED_SETTERS[key];\n installSetterSpy(gl, key, setter);\n }\n\n // intercept all getter functions in the table\n installGetterOverride(gl, 'getParameter');\n installGetterOverride(gl, 'isEnabled');\n }\n\n const glState = getContextState(gl);\n glState.enable = enable;\n\n return gl;\n}\n\n/**\n * Saves current WebGL context state onto an internal per-context stack\n */\nexport function pushContextState(gl: WebGLRenderingContext): void {\n let glState = getContextState(gl);\n if (!glState) {\n trackContextState(gl, {copyState: false});\n glState = getContextState(gl);\n }\n glState.push();\n}\n\n\n/**\n * Restores previously saved WebGL context state\n */\nexport function popContextState(gl: WebGLRenderingContext): void {\n const glState = getContextState(gl);\n assert(glState);\n glState.pop();\n}\n\n// HELPER FUNCTIONS - INSTALL GET/SET INTERCEPTORS (SPYS) ON THE CONTEXT\n\n/**\n// Overrides a WebGLRenderingContext state \"getter\" function\n// to return values directly from cache\n * @param gl\n * @param functionName\n */\nfunction installGetterOverride(gl: WebGLRenderingContext, functionName: string) {\n // Get the original function from the WebGLRenderingContext\n const originalGetterFunc = gl[functionName].bind(gl);\n\n // Wrap it with a spy so that we can update our state cache when it gets called\n gl[functionName] = function get(pname) {\n if (pname === undefined || NON_CACHE_PARAMETERS.has(pname)) {\n // Invalid or blacklisted parameter, do not cache\n return originalGetterFunc(pname);\n }\n\n const glState = getContextState(gl);\n if (!(pname in glState.cache)) {\n // WebGL limits are not prepopulated in the cache, call the original getter when first queried.\n glState.cache[pname] = originalGetterFunc(pname);\n }\n\n // Optionally call the original function to do a \"hard\" query from the WebGLRenderingContext\n return glState.enable\n ? // Call the getter the params so that it can e.g. serve from a cache\n glState.cache[pname]\n : // Optionally call the original function to do a \"hard\" query from the WebGLRenderingContext\n originalGetterFunc(pname);\n };\n\n // Set the name of this anonymous function to help in debugging and profiling\n Object.defineProperty(gl[functionName], 'name', {\n value: `${functionName}-from-cache`,\n configurable: false\n });\n}\n\n/**\n// Overrides a WebGLRenderingContext state \"setter\" function\n// to call a setter spy before the actual setter. Allows us to keep a cache\n// updated with a copy of the WebGL context state.\n * @param gl\n * @param functionName\n * @param setter\n * @returns\n */\nfunction installSetterSpy(gl: WebGLRenderingContext, functionName: string, setter: Function) {\n // Get the original function from the WebGLRenderingContext\n if (!gl[functionName]) {\n // This could happen if we try to intercept WebGL2 method on a WebGL1 context\n return;\n }\n\n const originalSetterFunc = gl[functionName].bind(gl);\n\n // Wrap it with a spy so that we can update our state cache when it gets called\n gl[functionName] = function set(...params) {\n // Update the value\n // Call the setter with the state cache and the params so that it can store the parameters\n const glState = getContextState(gl);\n // eslint-disable-next-line @typescript-eslint/unbound-method\n const {valueChanged, oldValue} = setter(glState._updateCache, ...params);\n\n // Call the original WebGLRenderingContext func to make sure the context actually gets updated\n if (valueChanged) {\n originalSetterFunc(...params);\n }\n\n // Note: if the original function fails to set the value, our state cache will be bad\n // No solution for this at the moment, but assuming that this is unlikely to be a real problem\n // We could call the setter after the originalSetterFunc. Concern is that this would\n // cause different behavior in debug mode, where originalSetterFunc can throw exceptions\n\n return oldValue;\n };\n\n // Set the name of this anonymous function to help in debugging and profiling\n Object.defineProperty(gl[functionName], 'name', {\n value: `${functionName}-to-cache`,\n configurable: false\n });\n}\n\nfunction installProgramSpy(gl: WebGLRenderingContext): void {\n const originalUseProgram = gl.useProgram.bind(gl);\n\n gl.useProgram = function useProgramLuma(handle) {\n const glState = getContextState(gl);\n if (glState.program !== handle) {\n originalUseProgram(handle);\n glState.program = handle;\n }\n };\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"track-context-state.js","names":["assert","GL_PARAMETER_DEFAULTS","GL_HOOKED_SETTERS","NON_CACHE_PARAMETERS","setParameters","getParameters","deepArrayEqual","GLState","constructor","gl","copyState","log","arguments","length","undefined","program","stateStack","enable","cache","Object","assign","_updateCache","bind","seal","push","values","pop","oldValues","valueChanged","oldValue","key","value","cached","getContextState","state","trackContextState","options","installProgramSpy","setter","installSetterSpy","installGetterOverride","glState","pushContextState","popContextState","functionName","originalGetterFunc","get","pname","has","defineProperty","configurable","originalSetterFunc","set","_len","params","Array","_key","originalUseProgram","useProgram","useProgramLuma","handle"],"sources":["../../../src/context/state-tracker/track-context-state.ts"],"sourcesContent":["// Support for listening to context state changes and intercepting state queries\n// NOTE: this system does not handle buffer bindings\nimport {assert} from '@luma.gl/core';\nimport {GL_PARAMETER_DEFAULTS, GL_HOOKED_SETTERS, NON_CACHE_PARAMETERS} from '../parameters/webgl-parameter-tables';\nimport {setParameters, getParameters} from '../parameters/unified-parameter-api';\nimport {deepArrayEqual} from './deep-array-equal';\n\n// HELPER CLASS - GLState\n\n/* eslint-disable no-shadow */\nclass GLState {\n gl: WebGLRenderingContext;\n program: unknown = null;\n stateStack: object[] = [];\n enable = true;\n cache: Record<string, any>;\n log;\n\n constructor(\n gl: WebGLRenderingContext,\n {\n copyState = false, // Copy cache from params (slow) or initialize from WebGL defaults (fast)\n log = () => {} // Logging function, called when gl parameter change calls are actually issued\n } = {}\n ) {\n this.gl = gl;\n this.cache = copyState ? getParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);\n this.log = log;\n\n this._updateCache = this._updateCache.bind(this);\n Object.seal(this);\n }\n\n push(values = {}) {\n this.stateStack.push({});\n }\n\n pop() {\n assert(this.stateStack.length > 0);\n // Use the saved values in the state stack to restore parameters\n const oldValues = this.stateStack[this.stateStack.length - 1];\n setParameters(this.gl, oldValues);\n // Don't pop until we have reset parameters (to make sure other \"stack frames\" are not affected)\n this.stateStack.pop();\n }\n\n /**\n // interceptor for context set functions - update our cache and our stack\n // values (Object) - the key values for this setter\n * @param values\n * @returns\n */\n _updateCache(values: {[key: number | string]: any}) {\n let valueChanged = false;\n let oldValue; // = undefined\n\n const oldValues: {[key: number | string]: any} | null = this.stateStack.length > 0 ? this.stateStack[this.stateStack.length - 1] : null;\n\n for (const key in values) {\n assert(key !== undefined);\n const value = values[key];\n const cached = this.cache[key];\n // Check that value hasn't already been shadowed\n if (!deepArrayEqual(value, cached)) {\n valueChanged = true;\n oldValue = cached;\n\n // First, save current value being shadowed\n // If a state stack frame is active, save the current parameter values for pop\n // but first check that value hasn't already been shadowed and saved\n if (oldValues && !(key in oldValues)) {\n oldValues[key] = cached;\n }\n\n // Save current value being shadowed\n this.cache[key] = value;\n }\n }\n\n return {valueChanged, oldValue};\n }\n}\n\nfunction getContextState(gl: WebGLRenderingContext): GLState {\n // @ts-expect-error\n return gl.state as GLState;\n}\n\n// PUBLIC API\n\n/**\n * Initialize WebGL state caching on a context\n * can be called multiple times to enable/disable\n *\n * @note After calling this function, context state will be cached\n * gl.state.push() and gl.state.pop() will be available for saving,\n * temporarily modifying, and then restoring state.\n */\nexport function trackContextState(\n gl: WebGLRenderingContext,\n options?: {\n enable?: boolean;\n copyState?: boolean;\n log?: any;\n }\n): WebGLRenderingContext {\n const {enable = true, copyState} = options;\n assert(copyState !== undefined);\n // @ts-expect-error\n if (!gl.state) {\n // @ts-ignore\n // const {polyfillContext} = global_;\n // if (polyfillContext) {\n // polyfillContext(gl);\n // }\n\n // Create a state cache\n // @ts-expect-error\n gl.state = new GLState(gl, {copyState});\n\n installProgramSpy(gl);\n\n // intercept all setter functions in the table\n for (const key in GL_HOOKED_SETTERS) {\n const setter = GL_HOOKED_SETTERS[key];\n installSetterSpy(gl, key, setter);\n }\n\n // intercept all getter functions in the table\n installGetterOverride(gl, 'getParameter');\n installGetterOverride(gl, 'isEnabled');\n }\n\n const glState = getContextState(gl);\n glState.enable = enable;\n\n return gl;\n}\n\n/**\n * Saves current WebGL context state onto an internal per-context stack\n */\nexport function pushContextState(gl: WebGLRenderingContext): void {\n let glState = getContextState(gl);\n if (!glState) {\n trackContextState(gl, {copyState: false});\n glState = getContextState(gl);\n }\n glState.push();\n}\n\n\n/**\n * Restores previously saved WebGL context state\n */\nexport function popContextState(gl: WebGLRenderingContext): void {\n const glState = getContextState(gl);\n assert(glState);\n glState.pop();\n}\n\n// HELPER FUNCTIONS - INSTALL GET/SET INTERCEPTORS (SPYS) ON THE CONTEXT\n\n/**\n// Overrides a WebGLRenderingContext state \"getter\" function\n// to return values directly from cache\n * @param gl\n * @param functionName\n */\nfunction installGetterOverride(gl: WebGLRenderingContext, functionName: string) {\n // Get the original function from the WebGLRenderingContext\n const originalGetterFunc = gl[functionName].bind(gl);\n\n // Wrap it with a spy so that we can update our state cache when it gets called\n gl[functionName] = function get(pname) {\n if (pname === undefined || NON_CACHE_PARAMETERS.has(pname)) {\n // Invalid or blacklisted parameter, do not cache\n return originalGetterFunc(pname);\n }\n\n const glState = getContextState(gl);\n if (!(pname in glState.cache)) {\n // WebGL limits are not prepopulated in the cache, call the original getter when first queried.\n glState.cache[pname] = originalGetterFunc(pname);\n }\n\n // Optionally call the original function to do a \"hard\" query from the WebGLRenderingContext\n return glState.enable\n ? // Call the getter the params so that it can e.g. serve from a cache\n glState.cache[pname]\n : // Optionally call the original function to do a \"hard\" query from the WebGLRenderingContext\n originalGetterFunc(pname);\n };\n\n // Set the name of this anonymous function to help in debugging and profiling\n Object.defineProperty(gl[functionName], 'name', {\n value: `${functionName}-from-cache`,\n configurable: false\n });\n}\n\n/**\n// Overrides a WebGLRenderingContext state \"setter\" function\n// to call a setter spy before the actual setter. Allows us to keep a cache\n// updated with a copy of the WebGL context state.\n * @param gl\n * @param functionName\n * @param setter\n * @returns\n */\nfunction installSetterSpy(gl: WebGLRenderingContext, functionName: string, setter: Function) {\n // Get the original function from the WebGLRenderingContext\n if (!gl[functionName]) {\n // This could happen if we try to intercept WebGL2 method on a WebGL1 context\n return;\n }\n\n const originalSetterFunc = gl[functionName].bind(gl);\n\n // Wrap it with a spy so that we can update our state cache when it gets called\n gl[functionName] = function set(...params) {\n // Update the value\n // Call the setter with the state cache and the params so that it can store the parameters\n const glState = getContextState(gl);\n // eslint-disable-next-line @typescript-eslint/unbound-method\n const {valueChanged, oldValue} = setter(glState._updateCache, ...params);\n\n // Call the original WebGLRenderingContext func to make sure the context actually gets updated\n if (valueChanged) {\n originalSetterFunc(...params);\n }\n\n // Note: if the original function fails to set the value, our state cache will be bad\n // No solution for this at the moment, but assuming that this is unlikely to be a real problem\n // We could call the setter after the originalSetterFunc. Concern is that this would\n // cause different behavior in debug mode, where originalSetterFunc can throw exceptions\n\n return oldValue;\n };\n\n // Set the name of this anonymous function to help in debugging and profiling\n Object.defineProperty(gl[functionName], 'name', {\n value: `${functionName}-to-cache`,\n configurable: false\n });\n}\n\nfunction installProgramSpy(gl: WebGLRenderingContext): void {\n const originalUseProgram = gl.useProgram.bind(gl);\n\n gl.useProgram = function useProgramLuma(handle) {\n const glState = getContextState(gl);\n if (glState.program !== handle) {\n originalUseProgram(handle);\n glState.program = handle;\n }\n };\n}\n"],"mappings":"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"}
package/dist/dist.dev.js CHANGED
@@ -1249,7 +1249,7 @@ var __exports__ = (() => {
1249
1249
  // Resource creation helpers
1250
1250
  _getBufferProps(props) {
1251
1251
  if (props instanceof ArrayBuffer || ArrayBuffer.isView(props)) {
1252
- return {
1252
+ props = {
1253
1253
  data: props
1254
1254
  };
1255
1255
  }
@@ -1261,6 +1261,8 @@ var __exports__ = (() => {
1261
1261
  newProps.indexType = "uint32";
1262
1262
  } else if (props.data instanceof Uint16Array) {
1263
1263
  newProps.indexType = "uint16";
1264
+ } else {
1265
+ log.warn("indices buffer content must be of integer type")();
1264
1266
  }
1265
1267
  }
1266
1268
  return newProps;
@@ -2278,8 +2280,8 @@ var __exports__ = (() => {
2278
2280
  const vertexFormat = bufferMapping?.vertexFormat || attributeTypeInfo.defaultVertexFormat;
2279
2281
  const vertexFormatInfo = decodeVertexFormat(vertexFormat);
2280
2282
  return {
2281
- name: name2,
2282
- bufferName: bufferMapping?.name || name2,
2283
+ attributeName: bufferMapping?.attributeName || shaderDeclaration.name,
2284
+ bufferName: bufferMapping?.bufferName || shaderDeclaration.name,
2283
2285
  location: shaderDeclaration.location,
2284
2286
  shaderType: shaderDeclaration.type,
2285
2287
  shaderDataType: attributeTypeInfo.dataType,
@@ -2303,38 +2305,63 @@ var __exports__ = (() => {
2303
2305
  }
2304
2306
  return attribute || null;
2305
2307
  }
2306
- function getAttributeFromBufferLayout(bufferLayout, name2) {
2307
- for (const bufferMapping of bufferLayout) {
2308
- if (bufferMapping.name === name2) {
2308
+ function getAttributeFromBufferLayout(bufferLayouts, name2) {
2309
+ checkBufferLayouts(bufferLayouts);
2310
+ let bufferLayoutInfo = getAttributeFromShortHand(bufferLayouts, name2);
2311
+ if (bufferLayoutInfo) {
2312
+ return bufferLayoutInfo;
2313
+ }
2314
+ bufferLayoutInfo = getAttributeFromAttributesList(bufferLayouts, name2);
2315
+ if (bufferLayoutInfo) {
2316
+ return bufferLayoutInfo;
2317
+ }
2318
+ log.warn(`layout for attribute "${name2}" not present in buffer layout`);
2319
+ return null;
2320
+ }
2321
+ function checkBufferLayouts(bufferLayouts) {
2322
+ for (const bufferLayout of bufferLayouts) {
2323
+ if (bufferLayout.attributes && bufferLayout.format || !bufferLayout.attributes && !bufferLayout.format) {
2324
+ log.warn(`BufferLayout ${name} must have either 'attributes' or 'format' field`);
2325
+ }
2326
+ }
2327
+ }
2328
+ function getAttributeFromShortHand(bufferLayouts, name2) {
2329
+ for (const bufferLayout of bufferLayouts) {
2330
+ if (bufferLayout.format && bufferLayout.name === name2) {
2309
2331
  return {
2310
- name: bufferMapping.name,
2332
+ attributeName: bufferLayout.name,
2311
2333
  bufferName: name2,
2312
- vertexFormat: bufferMapping.format,
2313
- byteOffset: bufferMapping.byteOffset || 0,
2314
- byteStride: bufferMapping.byteStride || 0
2334
+ stepMode: bufferLayout.stepMode,
2335
+ vertexFormat: bufferLayout.format,
2336
+ // If offset is needed, use `attributes` field.
2337
+ byteOffset: 0,
2338
+ byteStride: bufferLayout.byteStride || 0
2315
2339
  };
2316
2340
  }
2317
- let nextByteOffset = bufferMapping.byteOffset || 0;
2318
- let byteStride = 0;
2319
- for (const interleavedMapping of bufferMapping.attributes || []) {
2320
- const info = decodeVertexFormat(interleavedMapping.format);
2321
- byteStride += info.byteLength;
2322
- }
2323
- for (const interleavedMapping of bufferMapping.attributes || []) {
2324
- const byteOffset = nextByteOffset;
2325
- nextByteOffset += interleavedMapping?.byteStrideOffset || decodeVertexFormat(interleavedMapping.format).byteLength;
2326
- if (interleavedMapping.name === name2) {
2327
- return {
2328
- name: bufferMapping.name,
2329
- bufferName: name2,
2330
- vertexFormat: interleavedMapping.format,
2331
- byteOffset,
2332
- byteStride: bufferMapping.byteStride || byteStride
2333
- };
2341
+ }
2342
+ return null;
2343
+ }
2344
+ function getAttributeFromAttributesList(bufferLayouts, name2) {
2345
+ for (const bufferLayout of bufferLayouts) {
2346
+ let byteStride = bufferLayout.byteStride;
2347
+ if (typeof bufferLayout.byteStride !== "number") {
2348
+ for (const attributeMapping2 of bufferLayout.attributes || []) {
2349
+ const info = decodeVertexFormat(attributeMapping2.format);
2350
+ byteStride += info.byteLength;
2334
2351
  }
2335
2352
  }
2353
+ const attributeMapping = bufferLayout.attributes?.find((mapping) => mapping.attribute === name2);
2354
+ if (attributeMapping) {
2355
+ return {
2356
+ attributeName: attributeMapping.attribute,
2357
+ bufferName: bufferLayout.name,
2358
+ stepMode: bufferLayout.stepMode,
2359
+ vertexFormat: attributeMapping.format,
2360
+ byteOffset: attributeMapping.byteOffset,
2361
+ byteStride
2362
+ };
2363
+ }
2336
2364
  }
2337
- log.warn(`layout for attribute "${name2}" not present in buffer layout`);
2338
2365
  return null;
2339
2366
  }
2340
2367
  function mergeShaderLayout(baseLayout, overrideLayout) {
@@ -9086,8 +9113,8 @@ ${formattedLog}`)();
9086
9113
  }
9087
9114
  const webglBuffer = cast(buffer);
9088
9115
  const glType = getGLFromVertexType(attributeInfo.bufferDataType);
9089
- log.log(1, {
9090
- setAttribute: attributeInfo.name,
9116
+ log.log(2, {
9117
+ setAttribute: attributeInfo.attributeName,
9091
9118
  toBuffer: bufferName,
9092
9119
  size: attributeInfo.bufferComponents,
9093
9120
  type: glType,
package/dist/index.cjs CHANGED
@@ -5438,8 +5438,8 @@ var WEBGLRenderPipeline = class extends import_core23.RenderPipeline {
5438
5438
  }
5439
5439
  const webglBuffer = (0, import_core23.cast)(buffer);
5440
5440
  const glType = getGLFromVertexType(attributeInfo.bufferDataType);
5441
- import_core23.log.log(1, {
5442
- setAttribute: attributeInfo.name,
5441
+ import_core23.log.log(2, {
5442
+ setAttribute: attributeInfo.attributeName,
5443
5443
  toBuffer: bufferName,
5444
5444
  size: attributeInfo.bufferComponents,
5445
5445
  type: glType,