webgpu-computed 0.0.14 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgpu-computed",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "对webgpu的封装，处理了繁琐的前置工作，只关注wgsl本身逻辑",
   "main": "./src/index.js",
   "scripts": {

package/src/index.js

@@ -40,8 +40,8 @@ function U(s) {
   const e = Object.keys(s), r = e.map((c) => {
     const l = s[c];
     if (Array.isArray(l)) {
-      for (const y of ["vec2", "vec3", "vec4", "mat3x3", "mat4x4"])
-        if (B[y] === l.length) return y;
+      for (const d of ["vec2", "vec3", "vec4", "mat3x3", "mat4x4"])
+        if (B[d] === l.length) return d;
       throw new Error(`${c} 不支持的数组长度 ${l.length}`);
     }
     if (typeof l == "number") return "f32";
@@ -50,15 +50,15 @@ function U(s) {
   if (e.length !== r.length) throw new Error("keys 与 types 长度不一致");
   let i = 0;
   const f = e.map((c, l) => {
-    const y = r[l];
-    i += _(i, y);
+    const d = r[l];
+    i += _(i, d);
     const u = {
       name: c,
-      type: y,
+      type: d,
       offset: i,
-      size: B[y]
+      size: B[d]
     };
-    return i += B[y], u;
+    return i += B[d], u;
   }), t = Math.max(...r.map((c) => E[c]));
   return {
     stride: i + (t - i % t) % t,
@@ -111,7 +111,7 @@ class T {
       r(t.layout);
       const n = t.layout[t.layout.length - 1], c = n.offset + n.size;
       let l = 1;
-      for (const y of t.layout) l = Math.max(l, E[y.type]);
+      for (const d of t.layout) l = Math.max(l, E[d.type]);
       t.stride = P(c, l);
     };
     Object.keys(e).forEach((t) => {
@@ -133,9 +133,9 @@ class T {
     if (!this.template) throw new Error("初始化计算管线错误，未找到可用数据模版");
     await T.init();
     const e = this.template, { device: r } = await this.getDevice(), i = [], f = [], t = [];
-    this.device = r, Object.keys(e).forEach((a, p) => {
+    this.device = r, Object.keys(e).forEach((a, y) => {
       if (t.push({
-        binding: p,
+        binding: y,
         // 绑定到组里的0号位插槽
         visibility: GPUShaderStage.COMPUTE,
         // 数据在哪些阶段可以使用, 计算着色器、片元着色器、顶点着色器
@@ -144,20 +144,20 @@ class T {
         }
       }), m(e[a])) {
         const g = e[a], h = g.map((b) => `${b.name}:${b.type === "f32" ? "f32" : b.type + "<f32>"}`).join(","), A = `${S(a)}Struct`;
-        i.push(`struct ${S(a)}Struct {${h}};`), f.push(`@group(0) @binding(${p}) var<storage, read_write> ${a}: ${A};`);
+        i.push(`struct ${S(a)}Struct {${h}};`), f.push(`@group(0) @binding(${y}) var<storage, read_write> ${a}: ${A};`);
       } else if ($(e[a])) {
         const g = e[a], h = g.layout.map((b) => `${b.name}:${b.type === "f32" ? "f32" : b.type + "<f32>"}`).join(","), A = `${S(a)}Struct`;
-        i.push(`struct ${A} {${h}};`), f.push(`@group(0) @binding(${p}) var<storage, read_write> ${a}: array<${A}>;`);
+        i.push(`struct ${A} {${h}};`), f.push(`@group(0) @binding(${y}) var<storage, read_write> ${a}: array<${A}>;`);
       } else if (ArrayBuffer.isView(e[a]) && !(e[a] instanceof DataView)) {
         const g = e[a], h = q(g);
-        g instanceof D ? f.push(`@group(0) @binding(${p}) var<storage, read_write> ${a}: array<atomic<${h}>>;`) : f.push(`@group(0) @binding(${p}) var<storage, read_write> ${a}: array<${h}>;`);
+        g instanceof D ? f.push(`@group(0) @binding(${y}) var<storage, read_write> ${a}: array<atomic<${h}>>;`) : f.push(`@group(0) @binding(${y}) var<storage, read_write> ${a}: array<${h}>;`);
       }
     });
     const {
       beforeCodes: n = [],
       workgroupSize: c = [32, 1, 1],
       globalInvocationIdName: l = "grid",
-      workgroupIndexName: y = "index",
+      workgroupIndexName: d = "index",
       code: u = ""
     } = this.option ?? {}, o = (
       /*wgsl*/
@@ -168,18 +168,18 @@ ${f.join("")}
 
             @compute @workgroup_size(${c.join(",")})
             fn main(@builtin(global_invocation_id) ${l}: vec3<u32>) {
-                var ${y} = ${l}.x;
+                var ${d} = ${l}.x;
                 ${u}
             }
         `
     );
     this.code = o;
-    const d = r.createBindGroupLayout({
+    const p = r.createBindGroupLayout({
       entries: t
     });
-    this.groupLayout = d, this.pipeline = r.createComputePipeline({
+    this.groupLayout = p, this.pipeline = r.createComputePipeline({
       layout: r.createPipelineLayout({
-        bindGroupLayouts: [d]
+        bindGroupLayouts: [p]
       }),
       compute: {
         module: r.createShaderModule({ code: o, label: "" }),
@@ -197,26 +197,26 @@ ${f.join("")}
     if (!this.template) throw new Error("创建buffer组错误，未找到可用数据模版");
     if (!this.device) throw new Error("创建buffer组错误，未找到可用的gpu设备，请确保初始化完计算管线");
     const i = this.device, f = this.template, t = [], n = r?.buffers?.reduce((u, o) => (u.set(o.name, o.buffer), u), /* @__PURE__ */ new Map());
-    function c(u, o, d = 0, a) {
+    function c(u, o, p = 0, a) {
       if (!a) {
-        const p = o[o.length - 1], g = p.offset + p.size;
+        const y = o[o.length - 1], g = y.offset + y.size;
         let h = 1;
         for (const A of o) h = Math.max(h, E[A.type]);
         a = a ?? new Array(P(g, h)).fill(0);
       }
-      return o.forEach((p) => {
-        let g = u[p.name];
+      return o.forEach((y) => {
+        let g = u[y.name];
         Array.isArray(g) || (g = [g]);
-        for (let h = 0; h < p.size; h++)
-          a[d + p.offset + h] = Number(g[h] ?? 0);
+        for (let h = 0; h < y.size; h++)
+          a[p + y.offset + h] = Number(g[h] ?? 0);
       }), a;
     }
     function l(u, o) {
-      const d = new Array(o.stride * u.length).fill(0);
-      return u.forEach((a, p) => {
-        const g = p * o.stride;
-        c(a, o.layout, g, d);
-      }), d;
+      const p = new Array(o.stride * u.length).fill(0);
+      return u.forEach((a, y) => {
+        const g = y * o.stride;
+        c(a, o.layout, g, p);
+      }), p;
     }
     return Object.keys(f).forEach((u) => {
       if (!(u in e)) {
@@ -224,16 +224,16 @@ ${f.join("")}
           return t.push({ name: u, buffer: n.get(u) });
         throw new Error(`传入的数据中，不存在${u}字段`);
       }
-      const o = f[u], d = e[u];
+      const o = f[u], p = e[u];
       let a = [];
-      m(o) ? a = c(d, o) : $(o) ? a = l(d, o) : Array.isArray(d) && (a = d);
-      let p = null;
-      if (o instanceof Float32Array ? p = new Float32Array(a) : o instanceof Uint32Array ? p = new Uint32Array(a) : o instanceof Int32Array ? p = new Int32Array(a) : p = new Float32Array(a), !p) throw new Error("不支持的数组类型" + o);
+      m(o) ? a = c(p, o) : $(o) ? a = l(p, o) : (Array.isArray(p) || ArrayBuffer.isView(p)) && (a = p);
+      let y = null;
+      if (o instanceof Float32Array ? y = new Float32Array(a) : o instanceof Uint32Array ? y = new Uint32Array(a) : o instanceof Int32Array ? y = new Int32Array(a) : y = new Float32Array(a), !y) throw new Error("不支持的数组类型" + o);
       const g = i.createBuffer({
-        size: p.byteLength,
+        size: y.byteLength,
         usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE
       });
-      i.queue.writeBuffer(g, 0, p), t.push({ name: u, buffer: g });
+      i.queue.writeBuffer(g, 0, y), t.push({ name: u, buffer: g });
     }), {
       group: i.createBindGroup({
         layout: this.groupLayout,
@@ -255,9 +255,9 @@ ${f.join("")}
       const i = this.template[r], f = e.length / i.stride, t = [];
       for (let n = 0; n < f; n++) {
         const c = n * i.stride, l = {};
-        i.layout.forEach((y) => {
-          const u = e.slice(c + y.offset, c + y.offset + y.size);
-          l[y.name] = u.length === 1 ? u[0] : u;
+        i.layout.forEach((d) => {
+          const u = e.slice(c + d.offset, c + d.offset + d.size);
+          l[d.name] = u.length === 1 ? u[0] : u;
         }), t.push(l);
       }
       return t;
@@ -283,25 +283,25 @@ ${f.join("")}
     c.setPipeline(t), c.setBindGroup(0, e.group), c.dispatchWorkgroups(r[0], r[1], r[2]), c.end();
     const l = e.buffers?.map((o) => {
       if (i?.includes(o.name)) {
-        const d = f.createBuffer({
+        const p = f.createBuffer({
           size: o.buffer.size,
           usage: GPUBufferUsage.MAP_READ | GPUBufferUsage.COPY_DST
         });
-        return n.copyBufferToBuffer(o.buffer, 0, d, 0, d.size), { buffer: d, name: o.name };
+        return n.copyBufferToBuffer(o.buffer, 0, p, 0, p.size), { buffer: p, name: o.name };
       }
     }).filter((o) => !!o);
     f.queue.submit([n.finish()]), await f.queue.onSubmittedWorkDone();
-    const y = /* @__PURE__ */ new Map();
+    const d = /* @__PURE__ */ new Map();
     return await Promise.all(
       l.map(async (o) => {
         await o.buffer.mapAsync(GPUMapMode.READ);
-        const d = o.buffer.getMappedRange();
+        const p = o.buffer.getMappedRange();
         let a = null;
-        this.template[o.name] instanceof Float32Array ? a = new Float32Array(d) : this.template[o.name] instanceof Uint32Array ? a = new Uint32Array(d) : this.template[o.name] instanceof Int32Array ? a = new Int32Array(d) : a = new Float32Array(d);
-        const p = [...a];
-        y.set(o.name, p);
+        this.template[o.name] instanceof Float32Array ? a = new Float32Array(p) : this.template[o.name] instanceof Uint32Array ? a = new Uint32Array(p) : this.template[o.name] instanceof Int32Array ? a = new Int32Array(p) : a = new Float32Array(p);
+        const y = [...a];
+        d.set(o.name, y);
       })
-    ), i.map((o) => y.get(o));
+    ), i.map((o) => d.get(o));
   }
   /** 初始化gpu设备
    * @returns 
@@ -357,8 +357,8 @@ ${f.join("")}
    */
   static async computed(e) {
     let { data: r, map: i = !1, workgroupCount: f, synchronize: t, onSuccess: n, ...c } = e;
-    const l = await this.fromByData({ data: r, ...c }), y = l.createBindGroup(r), u = await l.computed(y, f, t);
-    return n && n({ gpuComputed: l, group: y, results: u }), i ? u.map((o, d) => l.dataMap(o, t[d])) : u;
+    const l = await this.fromByData({ data: r, ...c }), d = l.createBindGroup(r), u = await l.computed(d, f, t);
+    return n && n({ gpuComputed: l, group: d, results: u }), i ? u.map((o, p) => l.dataMap(o, t[p])) : u;
   }
 }
 const j = (