@luma.gl/shadertools 9.0.15 → 9.0.16

package/dist/lib/wgsl/get-shader-layout-wgsl.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { log } from '@luma.gl/core';
-import { WgslReflect } from '../../libs/wgsl-reflect/wgsl_reflect.module.js';
+import { WgslReflect } from 'wgsl_reflect';
 /**
  * Parse a ShaderLayout from WGSL shader source code.
  * @param source WGSL source code (can contain both @vertex and @fragment entry points)
@@ -20,10 +20,10 @@ export function getShaderLayoutFromWGSL(source) {
     }
     for (const uniform of parsedWGSL.uniforms) {
         const members = [];
-        for (const member of uniform.type.members) {
+        for (const attribute of uniform.type?.members || []) {
             members.push({
-                name: member.name,
-                type: getType(member.type)
+                name: attribute.name,
+                type: getType(attribute.type)
             });
         }
         shaderLayout.bindings.push({
@@ -45,7 +45,7 @@ export function getShaderLayoutFromWGSL(source) {
             const type = getType(wgslAttribute.type);
             shaderLayout.attributes.push({
                 name: wgslAttribute.name,
-                location: wgslAttribute.location,
+                location: Number(wgslAttribute.location),
                 type
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.0.15",
+  "version": "9.0.16",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -50,7 +50,8 @@
   },
   "dependencies": {
     "@math.gl/core": "^4.0.0",
-    "@math.gl/types": "^4.0.0"
+    "@math.gl/types": "^4.0.0",
+    "wgsl_reflect": "^1.0.1"
   },
-  "gitHead": "48b6e702cf6ad35748cfa88ffd249c17861ff2af"
+  "gitHead": "b1f2597d6efc8aa223ddb3bf6b1530510f17ea40"
 }

package/src/lib/wgsl/get-shader-layout-wgsl.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {ShaderAttributeType, ShaderLayout, log} from '@luma.gl/core';
-import {WgslReflect} from '../../libs/wgsl-reflect/wgsl_reflect.module.js';
+import {WgslReflect} from 'wgsl_reflect';
 
 /**
  * Parse a ShaderLayout from WGSL shader source code.
@@ -23,10 +23,10 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 
   for (const uniform of parsedWGSL.uniforms) {
     const members = [];
-    for (const member of uniform.type.members) {
+    for (const attribute of (uniform.type as any)?.members || []) {
       members.push({
-        name: member.name,
-        type: getType(member.type)
+        name: attribute.name,
+        type: getType(attribute.type)
       });
     }
 
@@ -53,7 +53,7 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 
       shaderLayout.attributes.push({
         name: wgslAttribute.name,
-        location: wgslAttribute.location,
+        location: Number(wgslAttribute.location),
         type
       });
     }