chore(shadertools): Use published wgsl_reflect module (#2055)

visgl · Mar 29, 2024 · e0edd3f · e0edd3f
1 parent 530f29d
commit e0edd3f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3,401 deletions.
diff --git a/modules/shadertools/package.json b/modules/shadertools/package.json
@@ -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": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
 }
diff --git a/modules/shadertools/src/lib/wgsl/get-shader-layout-wgsl.ts b/modules/shadertools/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
       });
     }