@aardworx/wombat.rendering 0.9.16 → 0.9.18

package/dist/runtime/heapScene.js

@@ -891,7 +891,14 @@ export function buildHeapScene(device, sig, initialDraws, opts = {}) {
     // right per-effect helper at draw time. Atlas-binding shape follows
     // from `family.drawHeaderUnion.atlasTextureBindings.size > 0`.
     void texIdOf; // retained for future per-bucket diagnostics
-    function findOrCreateBucket(effect, _textures, pipelineState) {
+    function findOrCreateBucket(effect, _textures, pipelineState, 
+    /**
+     * Optional precomputed descriptor. addDrawImpl passes this when
+     * the spec carries `modeRules` so the bucket key reflects the
+     * rule-evaluated value (not the raw PS aval values). When omitted
+     * the descriptor is snapshotted from PS as before.
+     */
+    precomputedDescriptor) {
         if (!familyBuilt) {
             throw new Error("heapScene: findOrCreateBucket called before family build");
         }
@@ -904,13 +911,25 @@ export function buildHeapScene(device, sig, initialDraws, opts = {}) {
         // (the actual value-set in the descriptor), so identical-value
         // cvals collapse to ONE bucket. See docs/derived-modes.md and
         // tests/heap-multi-pipeline-bucket.test.ts.
-        const psDescriptor = snapshotDescriptor(pipelineState, sig);
+        const psDescriptor = precomputedDescriptor ?? snapshotDescriptor(pipelineState, sig);
         const psModeKey = encodeModeKey(psDescriptor);
         const bk = `family#${fam.schema.id}|mk#${psModeKey.toString(16)}`;
         const existing = bucketByKey.get(bk);
         if (existing !== undefined)
             return existing;
-        const ps = resolvePipelineState(pipelineState);
+        // If a precomputed descriptor is supplied (rule-evaluated path),
+        // use its post-rule axis values so the pipeline reflects what the
+        // RO actually wants. Otherwise fall through to PS-aval forcing.
+        const ps = precomputedDescriptor !== undefined
+            ? {
+                topology: precomputedDescriptor.topology,
+                cullMode: precomputedDescriptor.cullMode,
+                frontFace: precomputedDescriptor.frontFace,
+                ...(precomputedDescriptor.depth !== undefined
+                    ? { depth: { write: precomputedDescriptor.depth.write, compare: precomputedDescriptor.depth.compare } }
+                    : {}),
+            }
+            : resolvePipelineState(pipelineState);
         const layout = fam.schema.drawHeaderUnion;
         const isAtlasBucket = layout.atlasTextureBindings.size > 0;
         const vsModule = fam.vsModule;
@@ -1185,7 +1204,23 @@ export function buildHeapScene(device, sig, initialDraws, opts = {}) {
         const perInstanceAttributes = spec.instanceAttributes !== undefined
             ? new Set(Object.keys(spec.instanceAttributes))
             : new Set();
-        const bucket = findOrCreateBucket(spec.effect, spec.textures, spec.pipelineState);
+        // If the spec has modeRules, pre-snapshot the rule-evaluated
+        // descriptor so the bucket key + pipeline reflect post-rule
+        // values. Without this, two ROs with identical PS but different
+        // rule outputs would collide on the same bucket.
+        let precomputedDescriptor;
+        if (spec.modeRules !== undefined) {
+            const uAvals = new Map();
+            for (const [name, val] of Object.entries(spec.inputs)) {
+                uAvals.set(name, asAval(val));
+            }
+            precomputedDescriptor = snapshotDescriptor(spec.pipelineState, sig, {
+                modeRules: spec.modeRules,
+                uniformAvals: uAvals,
+                token: outerTok,
+            });
+        }
+        const bucket = findOrCreateBucket(spec.effect, spec.textures, spec.pipelineState, precomputedDescriptor);
         const fam = familyFor(spec.effect);
         const effectFields = fam.fieldsForEffect.get(spec.effect.id);
         // Indices live in their own INDEX-usage buffer (WebGPU constraint).
@@ -1357,7 +1392,22 @@ export function buildHeapScene(device, sig, initialDraws, opts = {}) {
         // skipSubscribe: this tracker doesn't install its own callbacks.
         // The scene-level `modeAvalToDrawIds` does it once per unique aval
         // (the 20k-ROs-share-one-cullCval optimization).
-        const tracker = new ModeKeyTracker(spec.pipelineState, sig, () => { dirtyModeKeyDrawIds.add(drawId); }, { skipSubscribe: true });
+        // If the spec has modeRules, pre-build a uniforms-aval map the
+        // rule closures will read against; the tracker auto-discovers
+        // which avals each rule reads and surfaces them via forEachLeaf.
+        let uniformAvals;
+        if (spec.modeRules !== undefined) {
+            const m = new Map();
+            for (const [name, val] of Object.entries(spec.inputs)) {
+                m.set(name, asAval(val));
+            }
+            uniformAvals = m;
+        }
+        const tracker = new ModeKeyTracker(spec.pipelineState, sig, () => { dirtyModeKeyDrawIds.add(drawId); }, {
+            skipSubscribe: true,
+            ...(spec.modeRules !== undefined ? { modeRules: spec.modeRules } : {}),
+            ...(uniformAvals !== undefined ? { uniformAvals } : {}),
+        });
         drawIdToModeTracker[drawId] = tracker;
         tracker.forEachLeaf((av) => subscribeModeLeaf(av, drawId));
         // ─── §7 derived-uniforms registration ────────────────────────────