@luma.gl/core 9.2.5 → 9.3.0-alpha.10

package/dist/adapter-utils/bind-groups.js

@@ -0,0 +1,41 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { log } from "../utils/log.js";
+export function getShaderLayoutBinding(shaderLayout, bindingName, options) {
+    const bindingLayout = shaderLayout.bindings.find(binding => binding.name === bindingName ||
+        `${binding.name.toLocaleLowerCase()}uniforms` === bindingName.toLocaleLowerCase());
+    if (!bindingLayout && !options?.ignoreWarnings) {
+        log.warn(`Binding ${bindingName} not set: Not found in shader layout.`)();
+    }
+    return bindingLayout || null;
+}
+export function normalizeBindingsByGroup(shaderLayout, bindingsOrBindGroups) {
+    if (!bindingsOrBindGroups) {
+        return {};
+    }
+    if (areBindingsGrouped(bindingsOrBindGroups)) {
+        const bindGroups = bindingsOrBindGroups;
+        return Object.fromEntries(Object.entries(bindGroups).map(([group, bindings]) => [Number(group), { ...bindings }]));
+    }
+    const bindGroups = {};
+    for (const [bindingName, binding] of Object.entries(bindingsOrBindGroups)) {
+        const bindingLayout = getShaderLayoutBinding(shaderLayout, bindingName);
+        const group = bindingLayout?.group ?? 0;
+        bindGroups[group] ||= {};
+        bindGroups[group][bindingName] = binding;
+    }
+    return bindGroups;
+}
+export function flattenBindingsByGroup(bindGroups) {
+    const bindings = {};
+    for (const groupBindings of Object.values(bindGroups)) {
+        Object.assign(bindings, groupBindings);
+    }
+    return bindings;
+}
+function areBindingsGrouped(bindingsOrBindGroups) {
+    const keys = Object.keys(bindingsOrBindGroups);
+    return keys.length > 0 && keys.every(key => /^\d+$/.test(key));
+}
+//# sourceMappingURL=bind-groups.js.map

package/dist/adapter-utils/bind-groups.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bind-groups.js","sourceRoot":"","sources":["../../src/adapter-utils/bind-groups.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AASpC,OAAO,EAAC,GAAG,EAAC,wBAAqB;AAIjC,MAAM,UAAU,sBAAsB,CACpC,YAA6B,EAC7B,WAAmB,EACnB,OAAoC;IAEpC,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAC9C,OAAO,CAAC,EAAE,CACR,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,KAAK,WAAW,CAAC,iBAAiB,EAAE,CACpF,CAAC;IAEF,IAAI,CAAC,aAAa,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC/C,GAAG,CAAC,IAAI,CAAC,WAAW,WAAW,uCAAuC,CAAC,EAAE,CAAC;IAC5E,CAAC;IAED,OAAO,aAAa,IAAI,IAAI,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,YAA6B,EAC7B,oBAAiD;IAEjD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,kBAAkB,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,oBAAuC,CAAC;QAC3D,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAC,GAAG,QAAQ,EAAC,CAAC,CAAC,CACnE,CAAC;IACvB,CAAC;IAED,MAAM,UAAU,GAAoB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAgC,CAAC,EAAE,CAAC;QACtF,MAAM,aAAa,GAAG,sBAAsB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,aAAa,EAAE,KAAK,IAAI,CAAC,CAAC;QACxC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,UAAU,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;IAC3C,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,UAA2B;IAChE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,oBAAgD;IAC1E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/dist/adapter-utils/format-compiler-log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-compiler-log.d.ts","sourceRoot":"","sources":["../../src/adapter-utils/format-compiler-log.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,6CAA0C;AAEvE,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,6FAA6F;IAC7F,cAAc,CAAC,EAAE,IAAI,GAAG,QAAQ,GAAG,KAAK,CAAC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,GACA,MAAM,CAuCR"}
+{"version":3,"file":"format-compiler-log.d.ts","sourceRoot":"","sources":["../../src/adapter-utils/format-compiler-log.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,6CAA0C;AAEvE,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,6FAA6F;IAC7F,cAAc,CAAC,EAAE,IAAI,GAAG,QAAQ,GAAG,KAAK,CAAC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,GACA,MAAM,CA+CR"}

package/dist/adapter-utils/format-compiler-log.js

@@ -9,25 +9,33 @@ export function formatCompilerLog(shaderLog, source, options) {
     switch (options?.showSourceCode || 'no') {
         case 'all':
             // Parse the error - note: browser and driver dependent
-            let currentMessage = 0;
+            let currentMessageIndex = 0;
             for (let lineNum = 1; lineNum <= lines.length; lineNum++) {
-                formattedLog += getNumberedLine(lines[lineNum - 1], lineNum, options);
-                while (log.length > currentMessage && log[currentMessage].lineNum === lineNum) {
-                    const message = log[currentMessage++];
-                    formattedLog += formatCompilerMessage(message, lines, message.lineNum, {
+                const line = lines[lineNum - 1];
+                const currentMessage = log[currentMessageIndex];
+                if (line && currentMessage) {
+                    formattedLog += getNumberedLine(line, lineNum, options);
+                }
+                while (log.length > currentMessageIndex && currentMessage.lineNum === lineNum) {
+                    const message = log[currentMessageIndex++];
+                    if (message) {
+                        formattedLog += formatCompilerMessage(message, lines, message.lineNum, {
+                            ...options,
+                            inlineSource: false
+                        });
+                    }
+                }
+            }
+            // Print any remaining messages
+            while (log.length > currentMessageIndex) {
+                const message = log[currentMessageIndex++];
+                if (message) {
+                    formattedLog += formatCompilerMessage(message, [], 0, {
                         ...options,
                         inlineSource: false
                     });
                 }
             }
-            // Print any remaining messages
-            while (log.length > currentMessage) {
-                const message = log[currentMessage++];
-                formattedLog += formatCompilerMessage(message, [], 0, {
-                    ...options,
-                    inlineSource: false
-                });
-            }
             return formattedLog;
         case 'issues':
         case 'no':
@@ -52,9 +60,9 @@ ${numberedLines}${positionIndicator}${message.type.toUpperCase()}: ${message.mes
 
 `;
     }
-    const color = message.type === 'error' ? 'red' : '#8B4000'; // dark orange
+    const color = message.type === 'error' ? 'red' : 'orange';
     return options?.html
-        ? `<div class='luma-compiler-log-error' style="color:${color};"><b> ${message.type.toUpperCase()}: ${message.message}</b></div>`
+        ? `<div class='luma-compiler-log-${message.type}' style="color:${color};"><b> ${message.type.toUpperCase()}: ${message.message}</b></div>`
         : `${message.type.toUpperCase()}: ${message.message}`;
 }
 function getNumberedLines(lines, lineNum, options) {

package/dist/adapter-utils/format-compiler-log.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-compiler-log.js","sourceRoot":"","sources":["../../src/adapter-utils/format-compiler-log.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"format-compiler-log.js","sourceRoot":"","sources":["../../src/adapter-utils/format-compiler-log.ts"],"names":[],"mappings":"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"}

package/dist/adapter-utils/get-attribute-from-layouts.d.ts

@@ -1,6 +1,6 @@
 import type { PrimitiveDataType, NormalizedDataType } from "../shadertypes/data-types/data-types.js";
-import type { AttributeShaderType } from "../shadertypes/data-types/shader-types.js";
-import type { VertexFormat } from "../shadertypes/vertex-arrays/vertex-formats.js";
+import type { AttributeShaderType } from "../shadertypes/shader-types/shader-types.js";
+import type { VertexFormat } from "../shadertypes/vertex-types/vertex-formats.js";
 import type { ShaderLayout } from "../adapter/types/shader-layout.js";
 import type { BufferLayout } from "../adapter/types/buffer-layout.js";
 /** Resolved info for a buffer / attribute combination to help backend configure it correctly */

package/dist/adapter-utils/get-attribute-from-layouts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-attribute-from-layouts.d.ts","sourceRoot":"","sources":["../../src/adapter-utils/get-attribute-from-layouts.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,iBAAiB,EAAE,kBAAkB,EAAC,gDAA6C;AAChG,OAAO,KAAK,EAAC,mBAAmB,EAAC,kDAA+C;AAChF,OAAO,KAAK,EAAC,YAAY,EAAC,uDAAoD;AAM9E,OAAO,KAAK,EAAC,YAAY,EAAuB,0CAAuC;AACvF,OAAO,KAAK,EAAC,YAAY,EAAC,0CAAuC;AAEjE,gGAAgG;AAChG,MAAM,MAAM,aAAa,GAAG;IAC1B,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,UAAU,EAAE,mBAAmB,CAAC;IAChC,+EAA+E;IAC/E,aAAa,EAAE,iBAAiB,CAAC;IACjC,yFAAyF;IACzF,gBAAgB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,0GAA0G;IAC1G,OAAO,EAAE,OAAO,CAAC;IAEjB,iBAAiB;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,4BAA4B;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,6DAA6D;IAC7D,cAAc,EAAE,kBAAkB,CAAC;IACnC,iFAAiF;IACjF,gBAAgB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,uEAAuE;IACvE,UAAU,EAAE,OAAO,CAAC;IAEpB,mHAAmH;IACnH,QAAQ,EAAE,QAAQ,GAAG,UAAU,CAAC;IAEhC,wEAAwE;IACxE,UAAU,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAWF;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAS/B;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,EAC5B,mBAAmB,GAAE,MAAW,GAC/B,aAAa,EAAE,CAOjB"}
+{"version":3,"file":"get-attribute-from-layouts.d.ts","sourceRoot":"","sources":["../../src/adapter-utils/get-attribute-from-layouts.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,iBAAiB,EAAE,kBAAkB,EAAC,gDAA6C;AAChG,OAAO,KAAK,EAAC,mBAAmB,EAAC,oDAAiD;AAClF,OAAO,KAAK,EAAC,YAAY,EAAC,sDAAmD;AAG7E,OAAO,KAAK,EAAC,YAAY,EAAuB,0CAAuC;AACvF,OAAO,KAAK,EAAC,YAAY,EAAC,0CAAuC;AAEjE,gGAAgG;AAChG,MAAM,MAAM,aAAa,GAAG;IAC1B,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,UAAU,EAAE,mBAAmB,CAAC;IAChC,+EAA+E;IAC/E,aAAa,EAAE,iBAAiB,CAAC;IACjC,yFAAyF;IACzF,gBAAgB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,0GAA0G;IAC1G,OAAO,EAAE,OAAO,CAAC;IAEjB,iBAAiB;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,4BAA4B;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,6DAA6D;IAC7D,cAAc,EAAE,kBAAkB,CAAC;IACnC,iFAAiF;IACjF,gBAAgB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,uEAAuE;IACvE,UAAU,EAAE,OAAO,CAAC;IAEpB,mHAAmH;IACnH,QAAQ,EAAE,QAAQ,GAAG,UAAU,CAAC;IAEhC,wEAAwE;IACxE,UAAU,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAWF;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAS/B;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,EAC5B,mBAAmB,GAAE,MAAW,GAC/B,aAAa,EAAE,CAOjB"}

package/dist/adapter-utils/get-attribute-from-layouts.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { log } from "../utils/log.js";
-import { getAttributeShaderTypeInfo } from "../shadertypes/data-types/decode-shader-types.js";
-import { getVertexFormatInfo, getCompatibleVertexFormat } from "../shadertypes/vertex-arrays/decode-vertex-format.js";
+import { shaderTypeDecoder } from "../shadertypes/shader-types/shader-type-decoder.js";
+import { vertexFormatDecoder } from "../shadertypes/vertex-types/vertex-format-decoder.js";
 /**
  * Map from "attribute names" to "resolved attribute infos"
  * containing information about both buffer layouts and shader attribute declarations
@@ -40,10 +40,10 @@ function getAttributeInfoFromLayouts(shaderLayout, bufferLayout, name) {
         //  || !bufferMapping
         return null;
     }
-    const attributeTypeInfo = getAttributeShaderTypeInfo(shaderDeclaration.type);
-    const defaultVertexFormat = getCompatibleVertexFormat(attributeTypeInfo);
+    const attributeTypeInfo = shaderTypeDecoder.getAttributeShaderTypeInfo(shaderDeclaration.type);
+    const defaultVertexFormat = vertexFormatDecoder.getCompatibleVertexFormat(attributeTypeInfo);
     const vertexFormat = bufferMapping?.vertexFormat || defaultVertexFormat;
-    const vertexFormatInfo = getVertexFormatInfo(vertexFormat);
+    const vertexFormatInfo = vertexFormatDecoder.getVertexFormatInfo(vertexFormat);
     return {
         attributeName: bufferMapping?.attributeName || shaderDeclaration.name,
         bufferName: bufferMapping?.bufferName || shaderDeclaration.name,
@@ -121,7 +121,7 @@ function getAttributeFromAttributesList(bufferLayouts, name) {
         // Calculate a default byte stride if not provided
         if (typeof bufferLayout.byteStride !== 'number') {
             for (const attributeMapping of bufferLayout.attributes || []) {
-                const info = getVertexFormatInfo(attributeMapping.format);
+                const info = vertexFormatDecoder.getVertexFormatInfo(attributeMapping.format);
                 // @ts-ignore
                 byteStride += info.byteLength;
             }

package/dist/adapter-utils/get-attribute-from-layouts.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-attribute-from-layouts.js","sourceRoot":"","sources":["../../src/adapter-utils/get-attribute-from-layouts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-attribute-from-layouts.js","sourceRoot":"","sources":["../../src/adapter-utils/get-attribute-from-layouts.ts"],"names":[],"mappings":"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"}