@daugasauron/dolly-host-gpu 0.1.5 → 0.1.6

package/abi.mjs

@@ -46,5 +46,37 @@ export const DOLLY_GPU_BEGIN_RENDER_PASS = 23;
 export const DOLLY_GPU_END_RENDER_PASS = 24;
 export const DOLLY_GPU_DRAW_MESH = 25;
 export const DOLLY_GPU_VIEWPORT = 26;
+export const DOLLY_GPU_FEATURE_EXPLICIT = 1024;
+export const DOLLY_GPU_LIMITS = 8;
+export const DOLLY_GPU_BATCH_CONTINUE = 1;
+export const DOLLY_GPU_MAX_LAYOUT_ENTRIES = 128;
+export const DOLLY_GPU_CREATE_VIEW = 27;
+export const DOLLY_GPU_CREATE_BIND_GROUP_LAYOUT = 28;
+export const DOLLY_GPU_CREATE_PIPELINE_LAYOUT = 29;
+export const DOLLY_GPU_CREATE_BIND_GROUP = 30;
+export const DOLLY_GPU_CREATE_RENDER_PIPELINE = 31;
+export const DOLLY_GPU_CREATE_COMPUTE_PIPELINE = 32;
+export const DOLLY_GPU_CREATE_QUERY_SET = 33;
+export const DOLLY_GPU_COPY_BUFFER_TO_TEXTURE = 34;
+export const DOLLY_GPU_COPY_TEXTURE_TO_BUFFER = 35;
+export const DOLLY_GPU_COPY_TEXTURE_TO_TEXTURE = 36;
+export const DOLLY_GPU_CLEAR_BUFFER = 37;
+export const DOLLY_GPU_WRITE_TIMESTAMP = 38;
+export const DOLLY_GPU_RESOLVE_QUERY_SET = 39;
+export const DOLLY_GPU_BEGIN_VIEW_PASS = 40;
+export const DOLLY_GPU_BEGIN_COMPUTE_PASS = 41;
+export const DOLLY_GPU_END_COMPUTE_PASS = 42;
+export const DOLLY_GPU_SET_PIPELINE = 43;
+export const DOLLY_GPU_SET_BIND_GROUP = 44;
+export const DOLLY_GPU_SET_VERTEX_BUFFER = 45;
+export const DOLLY_GPU_SET_INDEX_BUFFER = 46;
+export const DOLLY_GPU_DRAW = 47;
+export const DOLLY_GPU_DRAW_INDEXED = 48;
+export const DOLLY_GPU_DRAW_INDIRECT = 49;
+export const DOLLY_GPU_DRAW_INDEXED_INDIRECT = 50;
+export const DOLLY_GPU_SET_BLEND_CONSTANT = 51;
+export const DOLLY_GPU_SET_STENCIL_REFERENCE = 52;
+export const DOLLY_GPU_DISPATCH = 53;
+export const DOLLY_GPU_DISPATCH_INDIRECT = 54;
 export const DOLLY_ERRNO = Object.freeze({ E2BIG: 1, EACCES: 2, EADDRINUSE: 3, EADDRNOTAVAIL: 4, EAFNOSUPPORT: 5, EAGAIN: 6, EALREADY: 7, EBADF: 8, EBADMSG: 9, EBUSY: 10, ECANCELED: 11, ECHILD: 12, ECONNABORTED: 13, ECONNREFUSED: 14, ECONNRESET: 15, EDEADLK: 16, EDESTADDRREQ: 17, EDOM: 18, EDQUOT: 19, EEXIST: 20, EFAULT: 21, EFBIG: 22, EHOSTUNREACH: 23, EIDRM: 24, EILSEQ: 25, EINPROGRESS: 26, EINTR: 27, EINVAL: 28, EIO: 29, EISCONN: 30, EISDIR: 31, ELOOP: 32, EMFILE: 33, EMLINK: 34, EMSGSIZE: 35, EMULTIHOP: 36, ENAMETOOLONG: 37, ENETDOWN: 38, ENETRESET: 39, ENETUNREACH: 40, ENFILE: 41, ENOBUFS: 42, ENODEV: 43, ENOENT: 44, ENOEXEC: 45, ENOLCK: 46, ENOLINK: 47, ENOMEM: 48, ENOMSG: 49, ENOPROTOOPT: 50, ENOSPC: 51, ENOSYS: 52, ENOTCONN: 53, ENOTDIR: 54, ENOTEMPTY: 55, ENOTRECOVERABLE: 56, ENOTSOCK: 57, ENOTTY: 59, ENXIO: 60, EOVERFLOW: 61, EOWNERDEAD: 62, EPERM: 63, EPIPE: 64, EPROTO: 65, EPROTONOSUPPORT: 66, EPROTOTYPE: 67, ERANGE: 68, EROFS: 69, ESPIPE: 70, ESRCH: 71, ESTALE: 72, ETIMEDOUT: 73, ETXTBSY: 74, EXDEV: 75, ENODATA: 116, ENOTSUP: 138 });
-export const DOLLY_GPU_ABI_DIGEST = "f2798b5850f46ad4287cdfd82fe36970af78c5184acd6cbefdded38f49444259";
+export const DOLLY_GPU_ABI_DIGEST = "3657d729d8b45db3587d12ec22ac9e83010045d9cdc6b068843f195acb65d52d";

package/bridge.mjs

@@ -1,7 +1,7 @@
 import { DOLLY_ERRNO as E } from "./abi.mjs";
 import { DOLLY_GPU_SLOTS, DOLLY_GPU_REPLY_BYTES } from "./abi.mjs";
 
-export async function createGpuBridge(memory, mailbox, canvas, complete, status) {
+export async function createGpuBridge(memory, mailbox, canvas, shown, complete, status) {
   const worker = new Worker(new URL("./worker.mjs", import.meta.url), { type: "module", name: "dolly-gpu" });
   const control = new Int32Array(new SharedArrayBuffer(8));
   let failed = false;
@@ -28,7 +28,7 @@ export async function createGpuBridge(memory, mailbox, canvas, complete, status)
     else if (data.type === "status") status(data);
   };
   worker.onerror = () => stop("GPU provider worker failed");
-  worker.postMessage({type:"configure", memory, mailbox, canvas, control:control.buffer}, canvas ? [canvas] : []);
+  worker.postMessage({type:"configure", memory, mailbox, canvas, shown, control:control.buffer}, canvas ? [canvas] : []);
   await initialized;
   function dispatch({address, bytes}) {
     if (failed) return -E.EIO;

package/gpu.mjs

@@ -43,7 +43,7 @@ function indicate(page, info, unavailable) {
     element.className = "page-indicator";
     element.setAttribute("role", "status");
     element.style.cssText = "position:absolute;right:0.5rem;bottom:2rem;z-index:8;max-width:calc(100% - 1rem);" +
-      "padding:0.15rem 0.45rem;background:#262626;border:1px solid;font-size:13px;pointer-events:none";
+      "padding:0.15rem 0.45rem;background:var(--dolly-ui-background);border:1px solid;font-size:13px;pointer-events:none";
   }
   if (unavailable) {
     element.replaceChildren(`No GPU: ${unavailable}`);
@@ -51,17 +51,17 @@ function indicate(page, info, unavailable) {
     if (page.site) {
       const link = Object.assign(document.createElement("a"), { textContent: "How to enable WebGPU ↗",
         href: new URL("docs/gpu.md#enabling-webgpu", page.site).href, target: "_blank", rel: "noopener" });
-      link.style.cssText = "color:#f2d45c;pointer-events:auto";
+      link.style.cssText = "color:var(--dolly-ui-accent);pointer-events:auto";
       element.append(" · ", link);
     }
-    announce(page, element, "unavailable", "#e98773");
+    announce(page, element, "unavailable", "var(--dolly-ui-alert)");
     return {};
   }
   const adapter = [info.vendor, info.architecture, info.description].filter(Boolean).join(" ") || "unnamed WebGPU adapter";
   // SwiftShader and llvmpipe are software adapters even where a browser does not flag them.
   const software = info.isFallbackAdapter || /swiftshader|llvmpipe/i.test(adapter);
   element.textContent = `${software ? "Software adapter, not a GPU" : "GPU"}: ${adapter} · ${info.f16 ? "" : "no "}shader-f16`;
-  announce(page, element, software ? "software" : "hardware", software ? "#f2d45c" : "#77736c");
+  announce(page, element, software ? "software" : "hardware", software ? "var(--dolly-ui-accent)" : "var(--dolly-ui-quiet)");
   return { adapter, isFallbackAdapter: info.isFallbackAdapter };
 }
 
@@ -72,7 +72,10 @@ export function browser(page) {
     canvas = document.createElement("canvas");
     canvas.id = "gpu-display";
     canvas.hidden = true;
-    canvas.style.cssText = "position:absolute;inset:0;width:100%;height:100%;pointer-events:none";
+    // Over the terminal: beside a smaller surface, its letterbox is the terminal's background, as
+    // display@0's is.
+    canvas.style.cssText = "position:absolute;inset:0;width:100%;height:100%;object-fit:contain;pointer-events:none;" +
+      "background:var(--dolly-ui-background)";
     mount.append(canvas);
     surface = canvas.transferControlToOffscreen();
   }
@@ -99,16 +102,26 @@ export function browser(page) {
 }
 
 export function worker({ send, configuration, get }) {
-  let bridge;
+  let bridge, animation = 0;
+  // This Worker's animation frames, counted while a program draws: the GPU Worker retires a
+  // presented frame at one of them, so a surface goes at the display's rate. The page's would
+  // make Chrome hold its pointer and wheel events for a frame; Chrome gives the GPU Worker,
+  // nested in this one, none.
+  const shown = configuration.canvas && new Int32Array(new SharedArrayBuffer(4));
+  const count = () => { Atomics.add(shown, 0, 1); Atomics.notify(shown, 0); animation = requestAnimationFrame(count); };
+  const counting = active => {
+    if (shown && active && !animation) animation = requestAnimationFrame(count);
+    if (shown && active === false) { cancelAnimationFrame(animation); animation = 0; }
+  };
   return {
     bindings: { "env.dolly_gpu_dispatch": (address, bytes) => {
       if (!bridge) return -E.ENOSYS;
       return bridge.dispatch({ address, bytes });
     } },
     async start({ kernel, memory }) {
-      bridge = await createGpuBridge(memory, Number(kernel.dolly_gpu_mailbox_address()), configuration.canvas,
-        () => get("runtime").serviceDeferred(), status => send({ ...status, type: "gpu-status" }));
+      bridge = await createGpuBridge(memory, Number(kernel.dolly_gpu_mailbox_address()), configuration.canvas, shown?.buffer,
+        () => get("runtime").serviceDeferred(), status => { counting(status.active); send({ ...status, type: "gpu-status" }); });
     },
-    dispose() { bridge?.dispose(); bridge = null; },
+    dispose() { counting(false); bridge?.dispose(); bridge = null; },
   };
 }

package/package.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "name": "@daugasauron/dolly-host-gpu",
   "license": "MIT",
   "dependencies": {
-    "@daugasauron/dolly": "0.1.5"
+    "@daugasauron/dolly": "0.1.6"
   },
   "description": "Dolly's gpu@0 host module: WebGPU on the browser's adapter, over the display.",
   "repository": {