pmndrs · thejustinwalsh · Aug 4, 2026 · Aug 3, 2026 · Aug 3, 2026 · Aug 3, 2026
diff --git a/apps/benchmarks/scripts/generate-japanese-showcase-subset.mts b/apps/benchmarks/scripts/generate-japanese-showcase-subset.mts
@@ -4,7 +4,7 @@ import { copyFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promi
 import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
 
-import { ADVANCED_SHAPING_CASES } from '../src/benchmark/advanced-shaping.ts';
+import { ADVANCED_SHAPING_CASES } from '../src/workloads/advanced-shaping.ts';
 
 const harfBuzzVersion = '13.0.0';
 const sourceDirectory = resolve('fixtures/fonts/noto-sans-cjk-2.004');

diff --git a/apps/benchmarks/src/app.tsx b/apps/benchmarks/src/app.tsx
@@ -14,7 +14,7 @@ import {
   type RefObject,
 } from 'react';
 
-import { BENCHMARK_IPSUM_INTER_GLYPH_COUNT } from './benchmark/benchmark-ipsum';
+import { BENCHMARK_IPSUM_INTER_GLYPH_COUNT } from './workloads/benchmark-ipsum';
 import {
   advanceAdvancedShapingByTime,
   advancedShapingCase,
@@ -23,7 +23,7 @@ import {
   updateAdvancedShaping,
   type AdvancedShapingCommand,
   type AdvancedShapingFrame,
-} from './benchmark/advanced-shaping';
+} from './workloads/advanced-shaping';
 import type { BenchmarkSummary, RunnerEvent } from './benchmark/contracts';
 import { environmentResource } from './benchmark/environment';
 import { runRegisteredBenchmark } from './benchmark/execution';

diff --git a/apps/benchmarks/src/benchmark/font-fixtures.ts b/apps/benchmarks/src/benchmark/font-fixtures.ts
@@ -1,5 +1,5 @@
-import type { AdvancedShapingFontFixture } from './advanced-shaping';
-import { BENCHMARK_IPSUM_CONFORMANCE_TEXT, BENCHMARK_IPSUM_TEXT } from './benchmark-ipsum';
+import type { AdvancedShapingFontFixture } from '../workloads/advanced-shaping';
+import { BENCHMARK_IPSUM_CONFORMANCE_TEXT, BENCHMARK_IPSUM_TEXT } from '../workloads/benchmark-ipsum';
 
 export type BenchmarkFontFixture =
   | AdvancedShapingFontFixture

diff --git a/apps/benchmarks/src/benchmark/presentation-sequence.test.ts b/apps/benchmarks/src/benchmark/presentation-sequence.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { ADVANCED_SHAPING_PRESENTATION_CYCLE_DURATION_MS } from './advanced-shaping';
+import { ADVANCED_SHAPING_PRESENTATION_CYCLE_DURATION_MS } from '../workloads/advanced-shaping';
 import {
   adjacentPresentationWorkload,
   PRESENTATION_SCENES,

diff --git a/apps/benchmarks/src/benchmark/presentation-sequence.ts b/apps/benchmarks/src/benchmark/presentation-sequence.ts
@@ -1,4 +1,4 @@
-import { ADVANCED_SHAPING_PRESENTATION_CYCLE_DURATION_MS } from './advanced-shaping';
+import { ADVANCED_SHAPING_PRESENTATION_CYCLE_DURATION_MS } from '../workloads/advanced-shaping';
 
 export const TEXT_LADDER_PRESENTATION_DURATION_MS = 7_200;
 // Three complete 3.5-second base cycles at the default 1.125× animation rate, rounded up to the next millisecond.

diff --git a/apps/benchmarks/src/benchmark/scenarios.ts b/apps/benchmarks/src/benchmark/scenarios.ts
@@ -1,5 +1,5 @@
 import type { BenchmarkScenario } from './contracts';
-import { ADVANCED_SHAPING_CASES } from './advanced-shaping';
+import { ADVANCED_SHAPING_CASES } from '../workloads/advanced-shaping';
 import paragraphBidiContract from '../../fixtures/contracts/paragraph-bidi-layout-v0.json';
 import cjkContract from '../../fixtures/contracts/paragraph-cjk-layout-v0.json';
 import cjkManifest from '../../fixtures/fonts/noto-sans-cjk-2.004/manifest.json';

diff --git a/apps/benchmarks/src/benchmark/target-boundary.test.ts b/apps/benchmarks/src/benchmark/target-boundary.test.ts
@@ -38,11 +38,16 @@ describe('benchmark target boundaries', () => {
   it('resolves targets through the lazy group registry without importing the monolithic implementation facade', async () => {
     const registry = await readFile(new URL('./targets/registry.ts', import.meta.url), 'utf8');
     const execution = await readFile(new URL('./execution.ts', import.meta.url), 'utf8');
+    const conformance = await readFile(new URL('./targets/conformance/index.ts', import.meta.url), 'utf8');
 
     expect(registry).toContain("import('./product')");
     expect(registry).toContain("import('./measurement/font-baker')");
     expect(registry).toContain("import('./conformance')");
     expect(execution).toContain('await loadRegisteredTarget(request.targetId)');
+    expect(conformance).toContain("import('./advanced-shaping')");
+    expect(conformance).not.toContain('renderer/advanced-shaping-conformance');
+    const { createAdvancedShapingConformanceTarget } = await import('./targets/conformance/advanced-shaping');
+    expect(createAdvancedShapingConformanceTarget().id).toBe('advanced-shaping-conformance');
     expect(await loadRegisteredTarget('missing')).toBeUndefined();
   });
 

diff --git a/.../renderer/advanced-shaping-conformance.ts → ...k/targets/conformance/advanced-shaping.ts b/.../renderer/advanced-shaping-conformance.ts → ...k/targets/conformance/advanced-shaping.ts
@@ -2,17 +2,17 @@ import { FontRegistry, Text, type RegisteredFont } from '@pmndrs/text';
 import { bitmap } from '@pmndrs/text/raster/bitmap';
 import * as THREE from 'three/webgpu';
 
-import amiriBitmapFontUrl from '../../fixtures/rendering/amiri-bitmap-16.font.glb?url';
-import notoCjkShowcaseBitmapFontUrl from '../../fixtures/rendering/noto-sans-cjk-showcase-bitmap-16.font.glb?url';
-import interBitmapFontUrl from '../../fixtures/rendering/inter-bitmap-16.font.glb?url';
-import devanagariBitmapFontUrl from '../../fixtures/rendering/noto-sans-devanagari-bitmap-16.font.glb?url';
+import amiriBitmapFontUrl from '../../../../fixtures/rendering/amiri-bitmap-16.font.glb?url';
+import notoCjkShowcaseBitmapFontUrl from '../../../../fixtures/rendering/noto-sans-cjk-showcase-bitmap-16.font.glb?url';
+import interBitmapFontUrl from '../../../../fixtures/rendering/inter-bitmap-16.font.glb?url';
+import devanagariBitmapFontUrl from '../../../../fixtures/rendering/noto-sans-devanagari-bitmap-16.font.glb?url';
 import {
   ADVANCED_SHAPING_CASES,
   advancedShapingFrames,
   type AdvancedShapingFontFixture,
-} from '../benchmark/advanced-shaping';
-import type { BenchmarkTarget } from '../benchmark/contracts';
-import { hashParagraphLayout, paragraphLayoutBytes } from '../benchmark/paragraph-layout-digest';
+} from '../../../workloads/advanced-shaping';
+import type { BenchmarkTarget } from '../../contracts';
+import { hashParagraphLayout, paragraphLayoutBytes } from '../../paragraph-layout-digest';
 
 const VIEWPORT_WIDTH = 800;
 const FONT_SIZE = 16;

diff --git a/apps/benchmarks/src/benchmark/targets/conformance/index.ts b/apps/benchmarks/src/benchmark/targets/conformance/index.ts
@@ -63,8 +63,7 @@ const advancedShapingTarget = () =>
       capabilities: rasterCapabilities,
       status: () => 'ready',
     },
-    async () =>
-      (await import('../../../renderer/advanced-shaping-conformance')).createAdvancedShapingConformanceTarget(),
+    async () => (await import('./advanced-shaping')).createAdvancedShapingConformanceTarget(),
   );
 
 function sourceOutlineFidelityTarget(technique: Technique, backend: Backend): BenchmarkTarget {

diff --git a/apps/benchmarks/src/components/presentation-control-dock.tsx b/apps/benchmarks/src/components/presentation-control-dock.tsx
@@ -21,7 +21,7 @@ import {
   type AdvancedShapingCommand,
   type AdvancedShapingFrame,
   type AdvancedShapingState,
-} from '../benchmark/advanced-shaping';
+} from '../workloads/advanced-shaping';
 /*
  * The dock intentionally consumes the same typed control state as the main panel.
  * shadcn/Base UI owns interaction semantics; this component only maps state to a compact presentation.

diff --git a/apps/benchmarks/src/components/render-controls.tsx b/apps/benchmarks/src/components/render-controls.tsx
@@ -5,7 +5,7 @@ import {
   type AdvancedShapingCommand,
   type AdvancedShapingFrame,
   type AdvancedShapingState,
-} from '../benchmark/advanced-shaping';
+} from '../workloads/advanced-shaping';
 import {
   BENCHMARK_FONT_LABELS,
   ICON_GRID_FONT_FIXTURE,

diff --git a/apps/benchmarks/src/components/workload-rail.tsx b/apps/benchmarks/src/components/workload-rail.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, type Dispatch, type SetStateAction } from 'react';
-import type { AdvancedShapingFrame } from '../benchmark/advanced-shaping';
+import type { AdvancedShapingFrame } from '../workloads/advanced-shaping';
 import {
   ADVANCED_FONT_FIXTURES,
   BENCHMARK_FONT_LABELS,

diff --git a/apps/benchmarks/src/renderer/comparison-workload.ts b/apps/benchmarks/src/renderer/comparison-workload.ts
@@ -10,7 +10,7 @@ import {
   comparisonWorkloadRequiresIconWindowSuspension as registryRequiresIconWindowSuspension,
   comparisonWorkloadUpdateKind as registryUpdateKind,
 } from '../workloads/registry';
-import { DYNAMIC_LAYOUT_TEXT, animateDynamicLayoutEntries, dynamicLayoutWidths } from '../workloads/dynamic-layout';
+import { DYNAMIC_LAYOUT_TEXT, dynamicLayoutWidths } from '../workloads/dynamic-layout';
 import {
   ICON_GRID_ITEMS,
   ICON_GRID_LABEL_SIZE,
@@ -33,14 +33,14 @@ import {
   type IconGridLayout,
   type IconGridVirtualWindow,
 } from '../workloads/icon-grid';
-import { animateOffAxis3dEntries } from '../workloads/off-axis-3d';
-import { animatePaintEffectsEntries, applyPaintEffectsRetainedConfiguration } from '../workloads/paint-effects';
-import { animateParagraphStressScene } from '../workloads/paragraph-stress';
-import { animateTextLadderScene } from '../workloads/text-ladder';
 import type { MutableTextLadderScenePosition } from '../workloads/text-ladder';
-import { ZOOM_TEXT_BASE_CSS_PX, animateZoomTextEntries } from '../workloads/zoom-text';
+import { ZOOM_TEXT_BASE_CSS_PX } from '../workloads/zoom-text';
 import type { ZoomTextAnimationState } from '../workloads/zoom-text';
-import type { ComparisonWorkloadConfiguration, ComparisonWorkloadId } from '../workloads/contracts';
+import type {
+  ComparisonWorkloadAnimationScratch,
+  ComparisonWorkloadConfiguration,
+  ComparisonWorkloadId,
+} from '../workloads/contracts';
 import { committedTextLayout, type ComparisonWorkloadEntry } from '../workloads/factory-contracts';
 import { loadBitmapFont, registeredBitmapAtlas, type BitmapTextLiveStats } from './bitmap-text';
 import { createCanvasSurface } from './canvas-surface';
@@ -401,6 +401,11 @@ async function createComparisonWorkloadRuntime(
   const zoomAnimationState: ZoomTextAnimationState = { phraseIndex: 0, phraseRevision: 0, progress: 0 };
   const textLadderPositionScratch: MutableTextLadderScenePosition = { x: 0, y: 0 };
   const dynamicWidthsScratch = new Float64Array(DYNAMIC_LAYOUT_TEXT.length);
+  const workloadAnimationScratch: ComparisonWorkloadAnimationScratch = {
+    dynamicWidths: dynamicWidthsScratch,
+    textLadderPosition: textLadderPositionScratch,
+    zoomText: zoomAnimationState,
+  };
   const iconAutoPanState: IconGridAutoPanState = { directionX: 1, directionY: 1, scrollX: 0, scrollY: 0 };
   const iconFrameDeltaState: IconGridFrameDeltaState = { smoothedElapsedMs: undefined };
   let iconAutoPanTimestamp: number | undefined;
@@ -1064,37 +1069,34 @@ async function createComparisonWorkloadRuntime(
         if (
           renderScene &&
           !fontFixtureSwitching &&
-          configuration.workload === 'text-ladder' &&
-          configuration.animationEnabled
+          (configuration.workload === 'text-ladder' || configuration.workload === 'paragraph-stress')
         ) {
-          animateTextLadderScene(
-            scene,
+          animateEntries(
             entries,
             configuration,
             Math.max(0, timestamp - animationEpoch),
             width,
             height,
-            textLadderPositionScratch,
+            scene,
+            workloadAnimationScratch,
+            onError,
+            recordReflow,
           );
         }
-        if (
-          renderScene &&
-          !fontFixtureSwitching &&
-          configuration.workload === 'paragraph-stress' &&
-          configuration.animationEnabled
-        ) {
-          animateParagraphStressScene(scene, entries, configuration, Math.max(0, timestamp - animationEpoch), height);
-        }
         if (renderScene && !fontFixtureCommitting) {
-          if (!fontFixtureSwitching) {
+          if (
+            !fontFixtureSwitching &&
+            configuration.workload !== 'text-ladder' &&
+            configuration.workload !== 'paragraph-stress'
+          ) {
             animateEntries(
               entries,
               configuration,
               Math.max(0, timestamp - animationEpoch),
-              zoomAnimationState,
-              dynamicWidthsScratch,
               width,
               height,
+              scene,
+              workloadAnimationScratch,
               onError,
               recordReflow,
             );
@@ -1422,50 +1424,33 @@ function layoutEntries(
 function animateEntries(
   entries: readonly WorkloadEntry[],
   configuration: ComparisonWorkloadConfiguration,
-  timestamp: number,
-  zoomAnimationState: ZoomTextAnimationState,
-  dynamicWidthsScratch: Float64Array,
+  elapsedMs: number,
   width: number,
   height: number,
+  scene: THREE.Scene,
+  scratch: ComparisonWorkloadAnimationScratch,
   onError: (error: unknown) => void,
   onReflow: (duration: number) => void,
 ): void {
-  if (configuration.workload === 'zoom-text') {
-    animateZoomTextEntries(entries, configuration, timestamp, zoomAnimationState);
-    return;
-  }
-  if (configuration.workload === 'paint-effects') {
-    animatePaintEffectsEntries(entries, configuration, timestamp);
-    return;
-  }
-  if (configuration.workload === 'dynamic-layout') {
-    animateDynamicLayoutEntries(
-      entries,
-      configuration,
-      timestamp,
-      width,
-      height,
-      dynamicWidthsScratch,
-      onError,
-      onReflow,
-    );
-    return;
-  }
-  if (configuration.workload === 'off-axis-3d') {
-    animateOffAxis3dEntries(entries, configuration, timestamp);
-  }
+  comparisonWorkloadDefinition(configuration.workload).animate(
+    entries,
+    configuration,
+    elapsedMs,
+    width,
+    height,
+    scene,
+    scratch,
+    onError,
+    onReflow,
+  );
 }
 
 function applyRetainedConfiguration(
   entries: readonly WorkloadEntry[],
   technique: RasterTechnique,
   configuration: ComparisonWorkloadConfiguration,
 ): void {
-  for (const entry of entries) {
-    if (entry.bounds !== undefined) entry.bounds.visible = configuration.showLayoutBounds;
-  }
-  if (configuration.workload !== 'paint-effects') return;
-  applyPaintEffectsRetainedConfiguration(entries, technique, configuration);
+  comparisonWorkloadDefinition(configuration.workload).applyRetainedConfiguration(entries, configuration, technique);
 }
 
 export function comparisonWorkloadUpdateKind(

diff --git a/apps/benchmarks/src/renderer/mtsdf-text.ts b/apps/benchmarks/src/renderer/mtsdf-text.ts
@@ -14,7 +14,7 @@ import showcaseManifest from '../../fixtures/rendering/showcase-mtsdf-fixtures-v
 import { conformanceText, type BenchmarkFontFixture, type SelectableFontFixture } from '../benchmark/font-fixtures';
 import type { BenchmarkTarget, TargetRunOutput } from '../benchmark/contracts';
 import type { FontDelivery } from '../benchmark/url-state';
-import { BENCHMARK_IPSUM_CONFORMANCE_TEXT } from '../benchmark/benchmark-ipsum';
+import { BENCHMARK_IPSUM_CONFORMANCE_TEXT } from '../workloads/benchmark-ipsum';
 import { createCanvasSurface, type CanvasSurface } from './canvas-surface';
 import { finiteCanvasDelta } from './canvas-view';
 import type { LiveFrameHistoryCursor } from './live-frame-telemetry';

diff --git a/apps/benchmarks/src/renderer/slug-text.ts b/apps/benchmarks/src/renderer/slug-text.ts
@@ -23,7 +23,7 @@ import devanagariCompressedFontUrl from '../../fixtures/rendering/noto-sans-deva
 import notoCjkShowcaseCompressedFontUrl from '../../fixtures/rendering/noto-sans-cjk-showcase-slug.font.glb.gz?url';
 import sourceSerifCompressedFontUrl from '../../fixtures/rendering/source-serif-4-slug.font.glb.gz?url';
 import showcaseManifest from '../../fixtures/rendering/showcase-slug-fixtures-v0.json';
-import { BENCHMARK_IPSUM_CONFORMANCE_TEXT } from '../benchmark/benchmark-ipsum';
+import { BENCHMARK_IPSUM_CONFORMANCE_TEXT } from '../workloads/benchmark-ipsum';
 import type { BenchmarkTarget, TargetRunOutput } from '../benchmark/contracts';
 import { rasterConformanceSpecimen, type BenchmarkFontFixture } from '../benchmark/font-fixtures';
 import type { FontDelivery } from '../benchmark/url-state';

diff --git a/...ks/src/benchmark/advanced-shaping.test.ts → ...ks/src/workloads/advanced-shaping.test.ts b/...ks/src/benchmark/advanced-shaping.test.ts → ...ks/src/workloads/advanced-shaping.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import type { BenchmarkMeasurement } from './contracts';
-import { scenarioById } from './scenarios';
+import type { BenchmarkMeasurement } from '../benchmark/contracts';
+import { scenarioById } from '../benchmark/scenarios';
 
 import {
   ADVANCED_SHAPING_CASES,
@@ -14,7 +14,7 @@ import {
   updateAdvancedShaping,
 } from './advanced-shaping';
 
-describe('advanced-shaping timeline', () => {
+describe('Advanced Shaping workload timeline', () => {
   it('starts the live showcase on CJK without publishing an empty playing frame', () => {
     expect(initialAdvancedShapingState()).toMatchObject({
       playing: true,

diff --git a/...chmarks/src/benchmark/advanced-shaping.ts → ...chmarks/src/workloads/advanced-shaping.ts b/...chmarks/src/benchmark/advanced-shaping.ts → ...chmarks/src/workloads/advanced-shaping.ts
@@ -1,3 +1,4 @@
+/** Authored Advanced Shaping workload state and timeline. */
 import { graphemeSegments } from 'unicode-segmenter/grapheme';
 
 export type AdvancedShapingCaseId =

diff --git a/...rks/src/benchmark/benchmark-ipsum.test.ts → ...rks/src/workloads/benchmark-ipsum.test.ts b/...rks/src/benchmark/benchmark-ipsum.test.ts → ...rks/src/workloads/benchmark-ipsum.test.ts
@@ -8,7 +8,7 @@ import {
   BENCHMARK_IPSUM_TEXT,
 } from './benchmark-ipsum';
 
-describe('benchmark ipsum', () => {
+describe('Benchmark Ipsum workload', () => {
   it('keeps five independently diagnosable conformance lanes', () => {
     expect(BENCHMARK_IPSUM_CONFORMANCE_LINES).toHaveLength(5);
     expect(BENCHMARK_IPSUM_CONFORMANCE_TEXT).toBe(BENCHMARK_IPSUM_CONFORMANCE_LINES.join('\n'));

diff --git a/...nchmarks/src/benchmark/benchmark-ipsum.ts → ...nchmarks/src/workloads/benchmark-ipsum.ts b/...nchmarks/src/benchmark/benchmark-ipsum.ts → ...nchmarks/src/workloads/benchmark-ipsum.ts
@@ -1,5 +1,5 @@
 /**
- * Stable product-demo corpus for native-strike rendering checks.
+ * Stable Benchmark Ipsum workload corpus for native-strike rendering checks.
  *
  * Keep each concern on its own line so a visual failure can be localized without
  * changing the corpus. Missing fixture coverage is reported rather than hidden by

diff --git a/apps/benchmarks/src/workloads/contracts.ts b/apps/benchmarks/src/workloads/contracts.ts
@@ -1,4 +1,5 @@
 import type { AnyRasterInput, RegisteredFont } from '@pmndrs/text';
+import type * as THREE from 'three/webgpu';
 
 import type { RasterConformanceSpecimen, BenchmarkFontFixture } from '../benchmark/font-fixtures';
 import type { RasterTechnique } from '../benchmark/url-state';
@@ -56,6 +57,13 @@ export interface ComparisonWorkloadCreateContext extends ComparisonWorkloadLayou
   readonly textLadderSpecimen?: RasterConformanceSpecimen;
 }
 
+/** Reused host-owned scratch storage exposed to workload frame hooks without per-frame allocation. */
+export interface ComparisonWorkloadAnimationScratch {
+  readonly dynamicWidths: Float64Array;
+  readonly textLadderPosition: { x: number; y: number };
+  readonly zoomText: { phraseIndex: number; phraseRevision: number; progress: number };
+}
+
 /**
  * App-private workload policy and scene hooks. The retained host remains responsible for renderer,
  * scene activation, cancellation, telemetry, and transactional Text publication.
@@ -67,6 +75,22 @@ export interface ComparisonWorkloadDefinition {
   readonly suspendsIconWindow: boolean;
   create(context: ComparisonWorkloadCreateContext): readonly ComparisonWorkloadEntry[];
   layout(entries: readonly ComparisonWorkloadEntry[], context: ComparisonWorkloadLayoutContext): void;
+  animate(
+    entries: readonly ComparisonWorkloadEntry[],
+    configuration: ComparisonWorkloadConfiguration,
+    elapsedMs: number,
+    viewportWidth: number,
+    viewportHeight: number,
+    scene: THREE.Scene,
+    scratch: ComparisonWorkloadAnimationScratch,
+    onError: (error: unknown) => void,
+    onReflow: (duration: number) => void,
+  ): void;
+  applyRetainedConfiguration(
+    entries: readonly ComparisonWorkloadEntry[],
+    configuration: ComparisonWorkloadConfiguration,
+    technique: RasterTechnique,
+  ): void;
   updateKind(
     previous: ComparisonWorkloadConfiguration,
     next: ComparisonWorkloadConfiguration,