wesl-tooling 0.6.4 → 0.6.5

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { VirtualLibraryFn, WeslBundle } from "wesl";
-import { GPUElementFormat } from "thimbleberry";
+import { WgslElementType, WgslElementType as WgslElementType$1 } from "thimbleberry";
 
 //#region src/ParseDependencies.d.ts
 /**
@@ -84,7 +84,7 @@ declare function compileShader(params: CompileShaderParams): Promise<GPUShaderMo
  * @param resultFormat - format for interpreting the result buffer data. (default u32)
  * @returns storage result array (typically four numbers if the buffer format is u32 or f32)
  */
-declare function testComputeShader(projectDir: string, gpu: GPU, src: string, resultFormat?: GPUElementFormat, conditions?: Record<string, boolean>): Promise<number[]>;
+declare function testComputeShader(projectDir: string, gpu: GPU, src: string, resultFormat: WgslElementType$1, conditions?: Record<string, boolean>): Promise<number[]>;
 /**
  * Transpiles and runs a simple compute shader on the GPU for testing.
  *
@@ -101,7 +101,7 @@ declare function testComputeShader(projectDir: string, gpu: GPU, src: string, re
  * @param resultFormat - format for interpreting the result buffer data. (default u32)
  * @returns storage result array
  */
-declare function runSimpleComputePipeline(device: GPUDevice, module: GPUShaderModule, resultFormat?: GPUElementFormat): Promise<number[]>;
+declare function runSimpleComputePipeline(device: GPUDevice, module: GPUShaderModule, resultFormat?: WgslElementType$1): Promise<number[]>;
 
 //#endregion
-export { CompileShaderParams, compileShader, dependencyBundles, parseDependencies, runSimpleComputePipeline, testComputeShader };
+export { CompileShaderParams, WgslElementType, compileShader, dependencyBundles, parseDependencies, runSimpleComputePipeline, testComputeShader };

package/dist/index.js

@@ -2,7 +2,7 @@ import { resolve } from "import-meta-resolve";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { WeslParseError, filterMap, findUnboundIdents, link, parseIntoRegistry, parsedRegistry, requestWeslDevice } from "wesl";
-import { copyBuffer } from "thimbleberry";
+import { copyBuffer, elementStride } from "thimbleberry";
 
 //#region src/ParseDependencies.ts
 /**
@@ -127,11 +127,11 @@ async function compileShader(params) {
 * @param resultFormat - format for interpreting the result buffer data. (default u32)
 * @returns storage result array (typically four numbers if the buffer format is u32 or f32)
 */
-async function testComputeShader(projectDir, gpu, src, resultFormat = "f32", conditions = {}) {
+async function testComputeShader(projectDir, gpu, src, resultFormat, conditions = {}) {
 	const adapter = await gpu.requestAdapter();
 	const device = await requestWeslDevice(adapter);
 	try {
-		const arraySize = resultBufferSize / elementByteSize(resultFormat);
+		const arraySize = resultBufferSize / elementStride(resultFormat);
 		const arrayType = `array<${resultFormat}, ${arraySize}>`;
 		const virtualLibs = { test: () => `@group(0) @binding(0) var <storage, read_write> results: ${arrayType};` };
 		const params = {
@@ -148,12 +148,6 @@ async function testComputeShader(projectDir, gpu, src, resultFormat = "f32", con
 		device.destroy();
 	}
 }
-/** size in bytes of a wgsl numeric type, e.g. 'f32' => 4 */
-function elementByteSize(fmt) {
-	const found = fmt.match(/\d+/);
-	const bits = Number.parseInt(found?.[0]);
-	return bits / 8;
-}
 /**
 * Transpiles and runs a simple compute shader on the GPU for testing.
 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl-tooling",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "type": "module",
   "files": [
     "dist"
@@ -10,7 +10,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "import-meta-resolve": "^4.1.0",
-    "thimbleberry": "^0.2.9"
+    "thimbleberry": "^0.2.10"
   },
   "devDependencies": {
     "dependent_package": "x",