@forgeax/engine-rhi-debug 0.1.34 → 0.1.35

package/dist/replay/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/replay/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/replay/session.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-rhi-debug",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -26,19 +26,19 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-rhi": "0.1.34",
-    "@forgeax/engine-types": "0.1.34",
+    "@forgeax/engine-rhi": "0.1.35",
+    "@forgeax/engine-types": "0.1.35",
     "@noble/hashes": "^2.2.0",
     "pako": "^1.0.11"
   },
   "devDependencies": {
-    "@forgeax/engine-rhi-null": "0.1.34",
+    "@forgeax/engine-rhi-null": "0.1.35",
     "@types/node": "^20.14.0",
     "@webgpu/types": "^0.1.71"
   },
   "peerDependencies": {
-    "@forgeax/engine-rhi-webgpu": "0.1.34",
-    "@forgeax/engine-rhi-wgpu": "0.1.34"
+    "@forgeax/engine-rhi-webgpu": "0.1.35",
+    "@forgeax/engine-rhi-wgpu": "0.1.35"
   },
   "forgeax": {
     "metrics": {

package/src/__tests__/e2e.browser.test.ts

@@ -142,6 +142,7 @@ async function captureBrowserTape(): Promise<CapturedBrowserTape> {
     'write source texture',
   );
   const encoder = must(device.createCommandEncoder({}), 'create command encoder');
+  encoder.pushDebugGroup('frame');
   const pass = encoder.beginRenderPass({
     colorAttachments: [
       {
@@ -154,8 +155,13 @@ async function captureBrowserTape(): Promise<CapturedBrowserTape> {
   } as never);
   pass.setPipeline(pipeline);
   pass.setBindGroup(0, bindGroup, []);
+  pass.pushDebugGroup('outer');
+  pass.pushDebugGroup('inner');
   pass.draw(3, 1, 0, 0);
+  pass.popDebugGroup();
+  pass.popDebugGroup();
   pass.end();
+  encoder.popDebugGroup();
   const command = must(encoder.finish(), 'finish command encoder');
   must(device.queue.submit([command]), 'submit command buffer');
   await device.queue.onSubmittedWorkDone();

package/src/__tests__/rhi-debug-fresh-replay.dawn.test.ts

@@ -103,6 +103,7 @@ async function makeRecording(pack: DawnPack): Promise<{
   const encoderResult = device.createCommandEncoder({});
   expect(encoderResult.ok).toBe(true);
   if (!encoderResult.ok) throw new Error(encoderResult.error.hint);
+  encoderResult.value.pushDebugGroup('frame');
   const pass = encoderResult.value.beginRenderPass({
     colorAttachments: [
       {
@@ -114,8 +115,13 @@ async function makeRecording(pack: DawnPack): Promise<{
     ],
   } as never);
   pass.setPipeline(pipeline.value);
+  pass.pushDebugGroup('outer');
+  pass.pushDebugGroup('inner');
   pass.draw(3, 1, 0, 0);
+  pass.popDebugGroup();
+  pass.popDebugGroup();
   pass.end();
+  encoderResult.value.popDebugGroup();
   const command = encoderResult.value.finish();
   expect(command.ok).toBe(true);
   if (!command.ok) throw new Error(command.error.hint);
@@ -127,7 +133,7 @@ async function makeRecording(pack: DawnPack): Promise<{
 }
 
 describe.skipIf(SKIP_DAWN)('RHI debug v7 fresh-device evidence', () => {
-  it('records, encodes, strictly decodes, and replays pixels on a fresh Dawn device', async () => {
+  it('records, encodes, strictly decodes, and replays pixels through nested debug groups on a fresh Dawn device', async () => {
     const pack = await loadDawn();
     const recording = await makeRecording(pack);
     const baseline = await readbackTexturePixels(

package/src/replay/session.ts

@@ -594,6 +594,13 @@ async function finalizeWorkPass(
     finishEventIndex ?? context.tape.events.length,
   );
   if (!closure.ok) return closure;
+  const groupsClosed = closeReplayDebugGroups(
+    context,
+    begin.cmdHandleId,
+    work.eventIndex,
+    encoder.resource.value as RhiCommandEncoder,
+  );
+  if (!groupsClosed.ok) return groupsClosed;
   const finished = (encoder.resource.value as RhiCommandEncoder).finish();
   const finishEvent = context.tape.events[finishEventIndex ?? work.eventIndex] ?? begin;
   if (!finished.ok)
@@ -656,6 +663,15 @@ function closeReplayPass(
         );
       }
     }
+    if (entry.resource.role === 'render-pass') {
+      const groupsClosed = closeReplayDebugGroups(
+        context,
+        begin.passHandleId,
+        selectedEventIndex,
+        entry.resource.value as RhiRenderPassEncoder,
+      );
+      if (!groupsClosed.ok) return groupsClosed;
+    }
     (entry.resource.value as RhiRenderPassEncoder | RhiComputePassEncoder).end();
   } catch (cause) {
     return eventFailure(pass.endEventIndex ?? selectedEventIndex, begin, 'encode', cause);
@@ -664,6 +680,42 @@ function closeReplayPass(
   return ok(undefined);
 }
 
+// Inspection stops at the selected work, before the recorded scope exits.
+// Derive only the still-open scopes from that prefix; never execute later work.
+function closeReplayDebugGroups(
+  context: ReplayExecutionContext,
+  handleId: string,
+  throughEventIndex: number,
+  encoder: RhiCommandEncoder | RhiRenderPassEncoder,
+): Result<void, RhiDebugError> {
+  const open: { event: RhiCallEvent; eventIndex: number }[] = [];
+  for (let eventIndex = 0; eventIndex <= throughEventIndex; eventIndex++) {
+    const event = context.tape.events[eventIndex];
+    if (event === undefined) continue;
+    if (
+      (event.kind === 'pushDebugGroup' && event.cmdHandleId === handleId) ||
+      (event.kind === 'passPushDebugGroup' && event.passHandleId === handleId)
+    ) {
+      open.push({ event, eventIndex });
+    } else if (
+      (event.kind === 'popDebugGroup' && event.cmdHandleId === handleId) ||
+      (event.kind === 'passPopDebugGroup' && event.passHandleId === handleId)
+    ) {
+      open.pop();
+    }
+  }
+  for (let index = open.length - 1; index >= 0; index--) {
+    const scope = open[index];
+    if (scope === undefined) continue;
+    try {
+      encoder.popDebugGroup();
+    } catch (cause) {
+      return eventFailure(scope.eventIndex, scope.event, 'encode', cause);
+    }
+  }
+  return ok(undefined);
+}
+
 async function replayCommandClosure(
   context: ReplayExecutionContext,
   cmdHandleId: string,