@luma.gl/engine 9.3.0-alpha.2 → 9.3.0-alpha.4

package/src/utils/buffer-layout-order.ts

@@ -4,6 +4,22 @@
 
 import {type BufferLayout, type ShaderLayout} from '@luma.gl/core';
 
+function getMinLocation(
+  attributeNames: string[],
+  shaderLayoutMap: Record<string, number | undefined>
+): number {
+  let minLocation = Infinity;
+
+  for (const name of attributeNames) {
+    const location = shaderLayoutMap[name];
+    if (location !== undefined) {
+      minLocation = Math.min(minLocation, location);
+    }
+  }
+
+  return minLocation;
+}
+
 export function sortedBufferLayoutByShaderSourceLocations(
   shaderLayout: ShaderLayout,
   bufferLayout: BufferLayout[]
@@ -16,8 +32,8 @@ export function sortedBufferLayoutByShaderSourceLocations(
   sortedLayout.sort((a, b) => {
     const attributeNamesA = a.attributes ? a.attributes.map(attr => attr.attribute) : [a.name];
     const attributeNamesB = b.attributes ? b.attributes.map(attr => attr.attribute) : [b.name];
-    const minLocationA = Math.min(...attributeNamesA.map(name => shaderLayoutMap[name]));
-    const minLocationB = Math.min(...attributeNamesB.map(name => shaderLayoutMap[name]));
+    const minLocationA = getMinLocation(attributeNamesA, shaderLayoutMap);
+    const minLocationB = getMinLocation(attributeNamesB, shaderLayoutMap);
 
     return minLocationA - minLocationB;
   });