mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 17:37:14 +00:00
188 lines
11 KiB
Markdown
188 lines
11 KiB
Markdown
# Creative Painting Studio: validation ledger
|
|
|
|
This branch contains independently scoped local work. It is not a completed studio
|
|
or a release. Original PhotoCraft additions do not change Photoshop parity counts.
|
|
|
|
## Source and upstream coordination
|
|
|
|
The mixer foundation started from `29f1ff9e90f2581ea2964e3276d85c71ab7e79a0`.
|
|
The 2026-10-11 upstream refresh resolved to
|
|
`e44d96e1d4671b8d9fd64fbabdf88fa8abf0441e`. The original baseline remains pinned.
|
|
Upstream #2131 now supplies prepared commits for ordinary Brush/Pencil and should
|
|
be retained when this branch integrates current main. #3098, #2885 and #2379 contain
|
|
overlapping brush performance work; no speedups from those branches are attributed
|
|
to this work. PDF Binder #2011 and PDF integration #2751 are untouched.
|
|
|
|
Open #2878 supplies an `ImageProvider`/`HttpTransport` interface, bounded encoded
|
|
sRGB image/mask interchange and cancellable engine jobs. Its inspected head is
|
|
`4754d3c6edb9b37a7ad8516f15425abeca84987d`. #730 offers the OpenAI backend;
|
|
#2879 is dependent UI; #2995 and #2649 concern local segmentation. No provider or
|
|
network-generation functionality is added by this painting foundation. Later AI
|
|
result/guidance work must reconcile these existing contributions.
|
|
|
|
## Gate 0 fixture and measurement scope
|
|
|
|
`crates/engine/examples/painting_baseline.rs` is intentionally compatible with the
|
|
pinned original source. Copy this example into a detached checkout of the baseline
|
|
and build it there. `painting_live.rs` uses the same fixture and path for the new
|
|
live mixer. Do not compare the old full-stroke commit timer to a new individual
|
|
update as though they measure the same amount of work.
|
|
|
|
Each case is a fresh process with three layers: a uniform background, a fully
|
|
allocated synthetic RGBA8 source with varying RGB and alpha, and an empty paint
|
|
layer. Dimensions are 2048², 4096² and 8192². Diameters are 16, 64, 256 and 1024 px;
|
|
spacing is 25%, seed 42, pressure one, smoothing off. Each path has 97 points, with
|
|
4 px or 48 px horizontal travel per update and a small sinusoidal vertical motion.
|
|
The rapid path travels back and forth, retaining a bounded painted region while
|
|
generating many interpolated dabs. Fixture construction is outside engine timers.
|
|
|
|
The process runner records observed peak working set and host CPU utilization at
|
|
100 ms intervals. Those process metrics include fixture construction and validation;
|
|
brief peaks can be missed. JSON engine timers record begin, average/p50/p95/p99/max
|
|
input-update costs, completion, dab throughput and Undo/Redo. Exact Undo/Redo document
|
|
comparisons are outside those timers. These are CPU-engine measurements, not UI frame
|
|
times, OS pointer-to-display latency or tablet measurements. GPU utilization and
|
|
display timings remain explicitly null. No FPS performance gate passes from these
|
|
measurements alone.
|
|
|
|
Build configuration used on Windows: rustc 1.97.1, release, LTO disabled, 16 codegen
|
|
units, four compiler jobs. Intel i7-9700K, eight logical processors. Avoid concurrent
|
|
compilation or other benchmarks when collecting comparative timings.
|
|
|
|
```powershell
|
|
cargo build -p photocraft-engine --example painting_baseline --release --locked --offline -j4 --config profile.release.lto=false --config profile.release.codegen-units=16
|
|
cargo build -p photocraft-engine --example painting_live --release --locked --offline -j4 --config profile.release.lto=false --config profile.release.codegen-units=16
|
|
# One example case; repeat all dimension / diameter / speed combinations.
|
|
target/release/examples/painting_baseline.exe 4096 256 rapid mixer
|
|
target/release/examples/painting_live.exe 4096 256 rapid mixer
|
|
```
|
|
|
|
The original ordinary-stamp benchmark replays the command on release. It does not
|
|
include upstream's subsequently merged #2131 optimization. Its baseline must remain
|
|
labeled with its actual source revision.
|
|
|
|
## Mixer optimization
|
|
|
|
The original incremental implementation built a tiled RGBA32F sample Surface per
|
|
dab and allocated temporary pixel vectors in both sampling and spatial deposition.
|
|
The optimized path feeds the compositor's contiguous pixels into a native-channel
|
|
Region, borrows sampled slices, and reuses deposition scratch vectors. It preserves
|
|
the original arithmetic and full-resolution coverage; it does not reduce quality.
|
|
An independent frozen pre-optimization kernel checks exact pixels and reservoir
|
|
state across RGB/Gray/CMYK/Lab, 8/16/F32, alpha/no-alpha, spatial/uniform paint,
|
|
current/composite sampling and transparency lock.
|
|
|
|
The size envelope now accepts 1024 px tips with at most 4,194,304 pixels per dense
|
|
footprint. The 256-tile working-set and input/dab limits remain. Larger sizes fail
|
|
explicitly with a suggestion to choose Brush; there is no silent mid-stroke quality
|
|
change. Acceptance of a size is not a responsiveness claim.
|
|
|
|
## Measured CPU matrix
|
|
|
|
All 96 baseline/live cases completed with exact Undo/Redo validation. The table gives
|
|
the worst mean/p95/p99 input-update times across the three canvas sizes and two
|
|
movement speeds in the new live implementation, in milliseconds.
|
|
|
|
| Diameter | Stamp mean / p95 / p99 | Mixer mean / p95 / p99 |
|
|
|---|---|---|
|
|
| 16 | 0.112 / 0.173 / 0.207 | 0.582 / 1.218 / 2.002 |
|
|
| 64 | 0.371 / 0.463 / 1.005 | 1.417 / 1.856 / 3.076 |
|
|
| 256 | 1.337 / 1.940 / 2.374 | 6.193 / 9.491 / 10.480 |
|
|
| 1024 | 4.654 / 24.169 / 38.489 | 20.845 / 108.355 / 162.528 |
|
|
|
|
Prepared mixer completion ranged from 0.674 to 3.451 ms. The original full-stroke
|
|
completion ranged from 9.451 to 4,085.397 ms; these completion measurements cover
|
|
different work because live rendering has moved that work into input updates.
|
|
Observed peak process working set was at most 400.6 MiB for the live matrix.
|
|
These results do not qualify 1024 px tips for the stated responsiveness targets.
|
|
Even the smaller engine-only timings do not prove display FPS or physical pen latency.
|
|
|
|
## Functional and platform gates
|
|
|
|
The mixer foundation unit/integration checks, live/committed screenshots and exact
|
|
pixel comparison are described in `mixer-live.md`. The first broad native test run
|
|
hit `0xc0000005` in concurrent `arbitrary_rotation_preview` tests on WARP. Both tests
|
|
passed serially. This matches the independently reported upstream #3212 issue;
|
|
no driver settings or host configuration were changed. Offscreen evidence uses the
|
|
Microsoft Basic Render Driver, not a verified physical RTX path.
|
|
|
|
Relevant reproducible checks:
|
|
|
|
```powershell
|
|
cargo test -p photocraft-paint -p photocraft-engine -p photocraft-ui-egui --lib --tests -- --test-threads=1
|
|
cargo clippy -p photocraft-paint -p photocraft-engine -p photocraft-ui-egui --all-targets -- -D warnings
|
|
cargo xtask layers
|
|
cargo xtask wasm
|
|
cargo xtask parity
|
|
cargo test -p photocraft-engine --test panic_hunt -- --ignored
|
|
cargo xtask perf --quick
|
|
```
|
|
|
|
Native Linux/Wayland/X11, macOS, physical Wacom/Windows pen input, physical GPU
|
|
presentation and real pointer-to-display latency remain unqualified on this host.
|
|
WASM compile success is not browser interaction qualification.
|
|
|
|
|
|
## Current-main integration qualification (2026-10-20)
|
|
|
|
PR #3627 integrates main `872748fb5b2a53e09dd4e385e31968d985c0515b`
|
|
(PhotoCraft 0.11.1), preserving the original `6c9ec00f` / `92891b59` commits.
|
|
The regular Mixer Brush tool and command use the live transaction automatically.
|
|
Upstream prepared Brush/Pencil and retouch commits, Color Replacement live strokes,
|
|
symmetry, Alt-Zoom and spring-loaded tool behavior remain in place. The new raw-pointer
|
|
regression checks real mixed pixels while held, exact prepared commit, one Undo step,
|
|
and return to the previous tool after a temporary Mixer Brush drag.
|
|
|
|
Native qualification was run serially on Windows to avoid concurrent WARP rendering:
|
|
|
|
- The broad engine/paint/UI run passed 1,812 engine unit tests, 233 engine integration
|
|
tests, 111 paint unit tests, and 3,148 UI unit tests. It initially failed two UI tests:
|
|
the old cancellation harness dropped an unapplied egui texture delta, and six mixer
|
|
control labels lacked translations. The harness now clears its unused test output,
|
|
and those labels are translated in all 20 catalogs.
|
|
- After those corrections, the same three-package test graph rebuilt successfully.
|
|
All 9 mixer and 69 localization unit tests passed; all 28 UI integration binaries
|
|
passed (116 tests). The rest of the already-passing unit tests were not repeated.
|
|
The broad run reported 32 ignored tests; these are not counted as passed.
|
|
- The separately invoked ignored `panic_hunt` adversarial command test passed.
|
|
- Native all-target check and strict all-target Clippy passed for the touched crates.
|
|
Layering, parity regeneration, scorecard regeneration and all `xtask wasm` checks
|
|
passed. Existing wasm-only unused-item warnings remain; compilation is not browser
|
|
interaction qualification.
|
|
- Windows rejected the single `cargo fmt --all -- --check` command with error 206
|
|
(command line too long). Checking the same 362 workspace target roots individually
|
|
with rustfmt and their declared editions passed without changing formatting rules.
|
|
|
|
The synthetic orange/teal fixture was inspected on both CPU and GPU canvas paths.
|
|
In each path, the held-stroke and committed canvas RGB bytes match exactly. The
|
|
captures use Microsoft Basic Render Driver / DX12; they do not qualify a physical
|
|
GPU, pen device, or pointer-to-display latency. The CPU captures and original asset
|
|
attribution are committed in `docs/images/mixer-main-*.png` and `ATTRIBUTION.md`.
|
|
|
|
### Current integration performance
|
|
|
|
`cargo xtask perf --quick --skip-build` completed all five release benchmark groups
|
|
successfully after prebuilding the configured examples. No baseline was updated.
|
|
The runner reports an RTX 2070 SUPER on this Windows host; its checked-in baseline
|
|
is from an Apple M4 Pro, so it explicitly skipped regression comparison. Quick-mode
|
|
budgets are not applied. The layout benchmark still reports slow group operations
|
|
(e.g. group-drag median 351.86 ms and release median 418.56 ms); this run does not
|
|
establish overall performance parity or that those timings regressed from main.
|
|
|
|
The release `mixer_probe` used a 6000 x 4000 three-layer synthetic document and
|
|
60 input updates. LTO was disabled and codegen units set to 16. The recorded working
|
|
tree was the uncommitted merge over `92891b59` and `872748fb`, not either parent alone.
|
|
|
|
| Tip (px) | Begin (ms) | Update median / p95 / max (ms) | Prepared commit (ms) | Historical frozen-composite whole stroke (ms) |
|
|
|---|---|---|---|---|
|
|
| 16 | 2.020 | 0.147 / 1.324 / 2.061 | 1.589 | 59.681 |
|
|
| 64 | 3.423 | 0.433 / 5.714 / 8.014 | 1.633 | 81.402 |
|
|
| 256 | 17.925 | 0.003 / 10.025 / 12.041 | 2.609 | 78.885 |
|
|
|
|
The last column measures a complete historical frozen-composite stroke, whereas
|
|
live-update and prepared-commit columns split that work across input events; they
|
|
must not be presented as an overall speedup ratio. At larger spacing some input
|
|
updates emit no dab, explaining the very small 256 px median. These are CPU engine
|
|
timings, not GPU/display FPS or physical tablet latency. The earlier 96-case matrix
|
|
remains historical evidence; it was not repeated for this integration.
|