@aardworx/wombat.rendering 0.21.20 → 0.21.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aardworx/wombat.rendering",
-  "version": "0.21.20",
+  "version": "0.21.22",
   "description": "WebGPU rendering layer for the Wombat TypeScript stack — RenderObject/RenderTask/runtime + window glue, port of Aardvark.Rendering's lower layers on top of WebGPU and wombat.shader.",
   "license": "MIT",
   "author": "krauthaufen",

package/src/runtime/heapEffect.ts

@@ -109,7 +109,15 @@ export interface FragmentOutputLayout {
 // and on quota; every failure simply degrades to "recompute".
 
 /** Cache-generation stamp for the persistent (localStorage) tier. */
-export const HEAP_PERSIST_VERSION = "h11"; // h11: FS textureSize on atlas-routed textures reads the draw-header size — emitted WGSL changed
+// h12: the atlas PAGE SIZE is embedded in the WGSL (uv divisor) — it
+// must be part of the persist key or a cached 4096-shader poisons an
+// 8192-page session (black beyond the first quadrant). The size rides
+// in the version string so any future size change re-keys too.
+export const HEAP_PERSIST_VERSION_BASE = "h12";
+export const HEAP_PERSIST_VERSION = HEAP_PERSIST_VERSION_BASE; // legacy export (see persistVersionNow)
+export function persistVersionNow(): string {
+  return `${HEAP_PERSIST_VERSION_BASE}-aps${atlasPageSizeNow()}`;
+}
 
 /**
  * Uniforms whose drawHeader word IS the u32 value (no arena
@@ -190,7 +198,7 @@ export function compileHeapEffect(effect: Effect, fragmentOutputLayout?: Fragmen
   const contentKey = effect.id + effectHoleKey(effect) + fboLayoutKey(fragmentOutputLayout);
   const mem = _compiledHeapEffectMemCache.get(contentKey);
   if (mem !== undefined) return mem;
-  const lsKey = persistKey(HEAP_PERSIST_VERSION, "che", contentKey);
+  const lsKey = persistKey(persistVersionNow(), "che", contentKey);
   const persisted = lsLoad(lsKey, isCompiledHeapEffect);
   if (persisted !== undefined) { _compiledHeapEffectMemCache.set(contentKey, persisted); return persisted; }
   const compiled = effect.compile(

package/src/runtime/heapEffectIR.ts

@@ -30,7 +30,7 @@ import {
 } from "@aardworx/wombat.shader/ir";
 import {
   megacallSearchPrelude, atlasVaryingNames,
-  generateAtlasBindings, generateAtlasSwitch, generateAtlasPrelude,
+  generateAtlasBindings, generateAtlasSwitch, generateAtlasPrelude, persistVersionNow,
   HEAP_PERSIST_VERSION, persistKey, lsLoad, lsStore,
   type BucketLayout,
   type DrawHeaderField,
@@ -987,7 +987,7 @@ export function compileHeapEffectIR(
   const contentKey = `${userEffect.id}${effectHoleKey(userEffect)}|${layout.id}|${mode}|${compileOptionsKey(compileOptions)}`;
   const mem = _heapIrMemCache.get(contentKey);
   if (mem !== undefined) return mem;
-  const lsKey = persistKey(HEAP_PERSIST_VERSION, "ir", contentKey);
+  const lsKey = persistKey(persistVersionNow(), "ir", contentKey);
   const persisted = lsLoad(lsKey, isHeapEffectIR);
   if (persisted !== undefined) { _heapIrMemCache.set(contentKey, persisted); return persisted; }
 

package/src/runtime/heapScene.ts

@@ -5135,7 +5135,9 @@ export function buildHeapScene(
       device.queue.submit([enc.finish()]);
 
       await arenaCopy.mapAsync(GPUMapMode.READ);
-      if (indicesCopy !== undefined) await indicesCopy.mapAsync(GPUMapMode.READ);
+      // indicesCopy may alias arenaCopy (indices live in the attr arena) —
+      // mapping the same buffer twice throws "already mapped".
+      if (indicesCopy !== undefined && indicesCopy !== arenaCopy) await indicesCopy.mapAsync(GPUMapMode.READ);
       for (const dc of dcs) {
         await dc.drawHeap.mapAsync(GPUMapMode.READ);
         if (dc.drawTable !== undefined) await dc.drawTable.mapAsync(GPUMapMode.READ);
@@ -5442,7 +5444,9 @@ const KNOWN_TYPE_IDS = new Set<number>([0, 1, 2, 3]);
       device.queue.submit([enc.finish()]);
 
       await arenaCopy.mapAsync(GPUMapMode.READ);
-      if (indicesCopy !== undefined) await indicesCopy.mapAsync(GPUMapMode.READ);
+      // indicesCopy may alias arenaCopy (indices live in the attr arena) —
+      // mapping the same buffer twice throws "already mapped".
+      if (indicesCopy !== undefined && indicesCopy !== arenaCopy) await indicesCopy.mapAsync(GPUMapMode.READ);
       for (const dc of dcs) {
         await dc.drawHeap.mapAsync(GPUMapMode.READ);
         await dc.drawTable.mapAsync(GPUMapMode.READ);
@@ -5716,7 +5720,9 @@ const KNOWN_TYPE_IDS = new Set<number>([0, 1, 2, 3]);
         device.queue.submit([enc.finish()]);
       }
       await arenaCopy.mapAsync(GPUMapMode.READ);
-      if (indicesCopy !== undefined) await indicesCopy.mapAsync(GPUMapMode.READ);
+      // indicesCopy may alias arenaCopy (indices live in the attr arena) —
+      // mapping the same buffer twice throws "already mapped".
+      if (indicesCopy !== undefined && indicesCopy !== arenaCopy) await indicesCopy.mapAsync(GPUMapMode.READ);
       const arenaU32 = new Uint32Array(arenaCopy.getMappedRange());
       const arenaF32 = new Float32Array(arenaU32.buffer, arenaU32.byteOffset, arenaU32.length);
       const indicesU32 = indicesCopy !== undefined