Free open-source image editor for the browser
Add a color mixer with vertical sliders (#22)
Rodrigo Belfioredc3c26e9b65b
diff --git a/API.md b/API.mdindex 6fd1aa0..4cce8ca 100644--- a/API.md+++ b/API.md@@ -47,6 +47,8 @@ Loading calls are queued. XMP import requires a loaded document and is skipped i`setToneCurve(points)` replaces the tone curve. Each point is `{ x, y }` with coordinates between 0 and 1. Supply at least two points, ordered by `x` with a minimum gap of `1/1024`. The first point must have `x = 0` or `y = 0`; the last must have `x = 1` or `y = 1`. Call `setToneCurve()` to reset it.+`setColorMixer(color, change)` updates one of `red`, `orange`, `yellow`, `green`, `aqua`, `blue`, `purple`, or `magenta`. Supply any of `hue`, `saturation`, and `luminance`, each a finite number from -100 to 100. Other colors and unspecified channels keep their values. `resetColorMixer()` resets every color as one undoable edit. A full shift of 100 rotates hue by 30°, scales saturation from zero to double, or moves luminance by one stop, weighted by each pixel's distance to the color's Oklab hue. Hue and saturation edits preserve luminance, and neutrals are unaffected.+For RAW sources, `setWhiteBalance({ temperature, tint })` sets absolute Kelvin and DNG tint, preserving unspecified values. Temperature accepts 2000–25000 K and tint accepts -150–150, with either range extended to include the file's As Shot value. `setWhiteBalance()` restores the source's initial balance. When camera multipliers are unavailable, that initial balance is the decoder's daylight fallback. The command throws for non-RAW sources or invalid values. Edits enter history immediately; preview development runs asynchronously, and export waits for the captured scene's development. The incremental temperature/tint adjustments remain separate RGB adjustments.`editScene(change)` shallowly merges a partial [Scene](src/lib/editor/scene.ts) into the document as an undoable edit. Supply complete values for nested fields such as `frame`. Prefer `setAdjustments` and `setToneCurve` for their validation.@@ -88,6 +90,6 @@ The image renders at the document dimensions and downsamples to `longEdge` with## State-`getState()` returns a detached snapshot containing `file`, `documentId`, `size`, `frame`, `adjustments`, `whiteBalance`, `toneCurve`, `preview`, and `history`. `whiteBalance` contains absolute temperature/tint for RAW sources and is undefined for other sources. `file` is the filename, and `history` contains `undoCount` and `redoCount`.+`getState()` returns a detached snapshot containing `file`, `documentId`, `size`, `frame`, `adjustments`, `whiteBalance`, `toneCurve`, `colorMixer`, `preview`, and `history`. `colorMixer` contains eight-value `hue`, `saturation`, and `luminance` arrays in the color order above, defaulting to zero. `whiteBalance` contains absolute temperature/tint for RAW sources and is undefined for other sources. `file` is the filename, and `history` contains `undoCount` and `redoCount`.Without a document, `documentId`, `size`, `frame`, and `preview` are undefined. Adjustments and the tone curve use their defaults, and history counts are zero. Mutating the snapshot does not edit the document.diff --git a/README.md b/README.mdindex b4c4f28..647bf4e 100644--- a/README.md+++ b/README.md@@ -7,6 +7,7 @@ Image processing runs locally with WebGPU. Built with TypeScript and React.## Features- Light and color adjustments+- Color Mixer with eight hue, saturation, and luminance ranges- Tone curves- Clarity and sharpening- Crop, rotate, straighten, and flip@@ -42,3 +43,13 @@ Run `bun run check` to format and lint, `bun run build` to type-check and build,[MIT](LICENSE)The bundled RAW decoder includes separately licensed libraries. See [NOTICE](NOTICE).++## Rendering benchmarks++Install the matching browser with `bunx --no-install playwright install --with-deps chromium`. The Playwright configuration uses SwiftShader's Vulkan backend on Linux for rendering and image transfers without a physical GPU.++Run `bun run test:browser --config playwright.bench.config.ts` separately from other GPU/browser work. It measures the renderer without the mixer, with neutral settings, and with all eight ranges active (hue 20, saturation 25, luminance 10). The fixture is a deterministic 2400×1600 linear Rec.2020 gradient containing neutrals, saturated colors, and HDR values; exposure is 0.25 and contrast is 10. Each workload uses 8 warmups and 40 measured samples.++Results and rendered PNGs are written under `test-results/benchmarks`. JSON includes environment details, individual samples, median/p95, renderer setup, first render, completed-render latency, and isolated mixer GPU timestamps when supported. Display, readback, and image encoding run outside the measured rendering loop. Software-adapter results describe that backend only.++For revision comparisons, run the same benchmark files and browser configuration in both checkouts. Revisions predating the mixer can run `--grep 'rendering baseline'`. The benchmark is opt-in and excluded from the regular test suite; correctness remains covered by the GPU pixel test and editing session.diff --git a/docs/benchmarks/color-mixer-active.png b/docs/benchmarks/color-mixer-active.pngnew file mode 100644index 0000000..d5e9499Binary files /dev/null and b/docs/benchmarks/color-mixer-active.png differdiff --git a/docs/benchmarks/color-mixer-neutral.png b/docs/benchmarks/color-mixer-neutral.pngnew file mode 100644index 0000000..03108a2Binary files /dev/null and b/docs/benchmarks/color-mixer-neutral.png differdiff --git a/docs/benchmarks/color-mixer.json b/docs/benchmarks/color-mixer.jsonnew file mode 100644index 0000000..cf3f027--- /dev/null+++ b/docs/benchmarks/color-mixer.json@@ -0,0 +1,736 @@+{+ "method": "Same harness and Chromium/Vulkan/SwiftShader flags in each checkout. 8 warmups and 40 samples per workload. CPU preparation and completed-render latency exclude display/readback/encoding; isolated active GPU durations use timestamp-query. Software-adapter measurements are not hardware GPU estimates.",+ "revisions": {+ "base": "fccc4ca",+ "before": "50f889f",+ "after": "50f889f plus validation changes; src/ is byte-identical to before"+ },+ "sourceTreeBeforeAndAfter": "3ce5232a552a5e7beac11f8e4f01c2146c60a065",+ "lineCounts": {+ "scope": "JavaScript/TypeScript under src and tests; declarations excluded",+ "before": {+ "physical": 8623,+ "nonblank": 8276+ },+ "after": {+ "physical": 8868,+ "nonblank": 8516+ },+ "productionDelta": 0,+ "editingSessionPhysical": {+ "before": 1095,+ "after": 1013+ },+ "additionalConfigPhysical": 18,+ "newHtmlPhysical": 9+ },+ "runs": {+ "base": {+ "baseline": {+ "revision": "fccc4caba12acae556dd218cdccb6b3be3c6fa77",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 45.59999942779541,+ "firstRenderMs": 315.80000019073486,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,+ 0.3000001907348633, 0.2999992370605469, 0.20000076293945312,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.19999980926513672, 0.10000038146972656, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.20000076293945312,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 244.20000076293945, 238.5, 243.19999980926514, 238.20000076293945,+ 233.79999923706055, 244.5, 235.20000076293945, 237,+ 243.89999961853027, 236.19999980926514, 243.5, 236.19999980926514,+ 247.69999980926514, 232.10000038146973, 236.5, 234.5,+ 234.19999980926514, 240.39999961853027, 242.70000076293945,+ 231.0999994277954, 237.69999980926514, 237.70000076293945,+ 232.79999923706055, 236.5, 234, 241.9000005722046,+ 235.69999980926514, 244.5, 233.89999961853027, 239.5,+ 232.60000038146973, 237.19999980926514, 236.4000005722046,+ 232.69999980926514, 234.30000019073486, 234.69999980926514,+ 235.89999961853027, 232, 238, 248.69999980926514+ ],+ "median": 236.5,+ "p95": 244.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ },+ "before": {+ "active": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "active",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 45.5,+ "firstRenderMs": 569.6000003814697,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.2999992370605469, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.39999961853027344, 0.3000001907348633, 0.20000076293945312,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.3000001907348633,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.20000076293945312,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 440, 440.0999994277954, 446.70000076293945, 449.5,+ 451.19999980926514, 438, 439.80000019073486, 443.5999994277954,+ 444.4000005722046, 441.69999980926514, 449, 440, 433.5,+ 450.6000003814697, 460.8999996185303, 437.9000005722046,+ 439.8999996185303, 445.5, 443.80000019073486, 440.5999994277954,+ 448.4000005722046, 456.0999994277954, 447.9000005722046,+ 457.5999994277954, 460.69999980926514, 451.1000003814697,+ 452.6000003814697, 454.0999994277954, 455, 449.9000005722046,+ 454.79999923706055, 458.5, 453.8999996185303, 457.20000076293945,+ 458.0999994277954, 455.4000005722046, 455, 458.19999980926514,+ 458.30000019073486, 457.6000003814697+ ],+ "median": 450.25000047683716,+ "p95": 458.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.39999961853027344, 0.19999980926513672,+ 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,+ 0.20000076293945312, 0.10000038146972656, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.10000038146972656,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.10000038146972656, 0.09999942779541016,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.10000038146972656, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 209.69999980926514, 208.30000019073486, 208.5999994277954,+ 204.10000038146973, 203.19999980926514, 198.69999980926514,+ 201.9000005722046, 205, 202.9000005722046, 199.89999961853027,+ 204.10000038146973, 209.30000019073486, 199.5, 203.19999980926514,+ 202, 199.39999961853027, 209.9000005722046, 200.5,+ 212.69999980926514, 201.4000005722046, 213.5, 202.5, 212.5,+ 206.69999980926514, 208, 204.89999961853027, 201.80000019073486,+ 213.60000038146973, 204.39999961853027, 209.69999980926514,+ 208.80000019073486, 205.9000005722046, 199.29999923706055,+ 205.60000038146973, 205.89999961853027, 203.10000038146973,+ 213.39999961853027, 210.30000019073486, 213.60000038146973,+ 209.30000019073486+ ],+ "median": 205.30000019073486,+ "p95": 213.5+ },+ "gpuMs": {+ "samples": [+ 208.752435, 207.079435, 206.96791399999998, 203.08783, 201.949274,+ 197.37588699999998, 200.24505399999998, 204.306288, 201.933333,+ 199.171177, 203.226101, 208.0626, 198.255302, 202.21149499999999,+ 200.33637399999998, 198.825085, 208.54652299999998, 199.63619,+ 212.174735, 200.570756, 211.997515, 201.668992, 211.147349,+ 205.70174699999998, 206.512621, 203.210782, 201.141369,+ 212.073904, 202.93762999999998, 208.65427499999998,+ 207.04537399999998, 205.292924, 197.68402799999998,+ 204.07582599999998, 204.961572, 201.95278399999998, 211.906884,+ 209.10155699999999, 212.35833599999998, 208.536294+ ],+ "median": 204.191057,+ "p95": 212.073904+ },+ "missingGpuSamples": 0+ },+ "outputBytes": 30720000,+ "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"+ },+ "baseline": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 44.80000019073486,+ "firstRenderMs": 315.4000005722046,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.20000076293945312,+ 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.2999992370605469, 0.20000076293945312,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.10000038146972656, 0.20000076293945312, 0.2999992370605469,+ 0.10000038146972656, 0.3000001907348633, 0.19999980926513672,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 243, 241.80000019073486, 236.39999961853027, 231.5999994277954,+ 237, 246, 240.5, 232.80000019073486, 241, 238.80000019073486,+ 232.9000005722046, 229.79999923706055, 243.10000038146973, 236,+ 230.89999961853027, 235, 229.80000019073486, 242.80000019073486,+ 231.60000038146973, 237, 236.0999994277954, 237.9000005722046,+ 249.5, 244.19999980926514, 242.80000019073486, 242.79999923706055,+ 235.60000038146973, 241.69999980926514, 235, 240.69999980926514,+ 238, 250.70000076293945, 240.29999923706055, 237.80000019073486,+ 236.80000019073486, 232.89999961853027, 234, 236.30000019073486,+ 234.80000019073486, 241.39999961853027+ ],+ "median": 237.40000009536743,+ "p95": 246+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ },+ "neutral": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "neutral",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 52,+ "firstRenderMs": 344,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.19999980926513672, 0.39999961853027344, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.09999942779541016, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.2999992370605469, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 244.20000076293945, 249, 238.5, 241.19999980926514,+ 241.20000076293945, 250.19999980926514, 259.69999980926514,+ 257.19999980926514, 241.80000019073486, 253.69999980926514,+ 240.60000038146973, 238.9000005722046, 239.5, 241.0999994277954,+ 244.10000038146973, 246.19999980926514, 246.30000019073486,+ 257.69999980926514, 248.0999994277954, 243.70000076293945,+ 242.0999994277954, 238.60000038146973, 242.19999980926514,+ 241.89999961853027, 237.80000019073486, 245.5, 245.69999980926514,+ 254.5999994277954, 243.4000005722046, 249.19999980926514,+ 243.80000019073486, 246.0999994277954, 252.10000038146973, 247,+ 248.0999994277954, 237.70000076293945, 246.19999980926514,+ 242.89999961853027, 248.10000038146973, 242.69999980926514+ ],+ "median": 244.1500005722046,+ "p95": 257.19999980926514+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.09999942779541016, 0.10000038146972656, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0, 0, 0, 0.10000038146972656, 0, 0, 0,+ 0, 0, 0.10000038146972656, 0, 0, 0, 0, 0, 0, 0, 0,+ 0.10000038146972656, 0.10000038146972656, 0, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0.10000038146972656, 0,+ 0.10000038146972656, 0.09999942779541016, 0+ ],+ "median": 0,+ "p95": 0.10000038146972656+ },+ "completedMs": {+ "samples": [+ 0.09999942779541016, 0.20000076293945312, 0, 0.19999980926513672,+ 0, 0.19999980926513672, 0.10000038146972656, 0,+ 0.19999980926513672, 0.09999942779541016, 0, 0.20000076293945312,+ 0, 0.19999980926513672, 0, 0.19999980926513672, 0,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0.19999980926513672, 0.10000038146972656,+ 0.10000038146972656, 0.10000038146972656, 0, 0.19999980926513672,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.19999980926513672,+ 0.10000038146972656+ ],+ "median": 0.10000038146972656,+ "p95": 0.19999980926513672+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ },+ "after": {+ "active": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "active",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 44.59999942779541,+ "firstRenderMs": 565,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.2999992370605469,+ 0.3000001907348633, 0.20000076293945312, 0.3000001907348633,+ 0.3000001907348633, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.39999961853027344+ ],+ "median": 0.3000001907348633,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 455.80000019073486, 449.5, 441.5, 437.79999923706055,+ 445.20000076293945, 444.3999996185303, 449.69999980926514,+ 443.1000003814697, 440.5, 443.9000005722046, 442.19999980926514,+ 449.8999996185303, 440.80000019073486, 445.1000003814697,+ 445.5999994277954, 457.19999980926514, 460.5, 452.5,+ 464.80000019073486, 450, 439.19999980926514, 447.4000005722046,+ 434.0999994277954, 435.9000005722046, 448.1000003814697,+ 438.30000019073486, 460.79999923706055, 437, 441.30000019073486,+ 439.5, 441.5, 444.4000005722046, 459.19999980926514,+ 455.8999996185303, 451.69999980926514, 455.6000003814697,+ 445.19999980926514, 456.30000019073486, 452.8999996185303,+ 452.1000003814697+ ],+ "median": 445.40000009536743,+ "p95": 460.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.10000038146972656, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.09999942779541016, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.20000076293945312, 0.3000001907348633, 0.20000076293945312,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.20000028610229492,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 212.30000019073486, 208.4000005722046, 210.89999961853027,+ 208.19999980926514, 209.20000076293945, 212.39999961853027,+ 208.30000019073486, 208.89999961853027, 208.80000019073486,+ 208.0999994277954, 206.80000019073486, 209.19999980926514,+ 208.10000038146973, 211.80000019073486, 200.0999994277954,+ 198.19999980926514, 198.89999961853027, 200.5, 203,+ 206.20000076293945, 201.79999923706055, 205.9000005722046,+ 208.5999994277954, 206.5, 221.30000019073486, 207.89999961853027,+ 210, 203.4000005722046, 205.80000019073486, 202.10000038146973,+ 210.5, 214.5, 203.0999994277954, 205.10000038146973,+ 207.39999961853027, 203.9000005722046, 217.5999994277954,+ 202.9000005722046, 201.69999980926514, 208.69999980926514+ ],+ "median": 207.99999952316284,+ "p95": 214.5+ },+ "gpuMs": {+ "samples": [+ 211.35441, 207.26082499999998, 210.036193, 206.62772199999998,+ 208.268992, 211.02247799999998, 206.897754, 207.99319, 207.685598,+ 206.964214, 205.671876, 208.337422, 207.33130599999998,+ 210.237904, 199.270838, 196.73511299999998, 197.87704, 199.467618,+ 202.023484, 204.95017199999998, 201.25691, 204.877752, 207.670698,+ 205.355844, 219.834251, 207.134095, 208.732485, 202.298646,+ 204.27480799999998, 200.714776, 209.262287, 213.00317099999998,+ 202.009405, 204.222567, 206.14659999999998, 202.98926,+ 216.07173799999998, 201.488991, 200.262373, 207.93025+ ],+ "median": 206.76273799999998,+ "p95": 213.00317099999998+ },+ "missingGpuSamples": 0+ },+ "outputBytes": 30720000,+ "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"+ },+ "baseline": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 43.89999961853027,+ "firstRenderMs": 315.1000003814697,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.10000038146972656, 0.09999942779541016, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.10000038146972656, 0.20000076293945312, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.19999980926513672, 0.10000038146972656,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 242.89999961853027, 239.60000038146973, 248.10000038146973,+ 239.89999961853027, 243.5, 244.80000019073486, 239.19999980926514,+ 237.5, 240.69999980926514, 241.5, 238.9000005722046,+ 234.0999994277954, 236.30000019073486, 238.89999961853027,+ 232.69999980926514, 235.60000038146973, 241.5, 239.39999961853027,+ 243, 238.60000038146973, 243.20000076293945, 244.19999980926514,+ 241, 241.80000019073486, 245.30000019073486, 240.19999980926514,+ 238, 234.9000005722046, 231.79999923706055, 234.30000019073486,+ 243.5, 235.19999980926514, 236.69999980926514, 234.5,+ 238.30000019073486, 241, 238.39999961853027, 238.5,+ 238.80000019073486, 237.5+ ],+ "median": 239.05000019073486,+ "p95": 244.80000019073486+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ },+ "neutral": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "neutral",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 47.59999942779541,+ "firstRenderMs": 315.20000076293945,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.19999980926513672, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.10000038146972656, 0.09999942779541016, 0.09999942779541016,+ 0.2999992370605469, 0.3000001907348633, 0.09999942779541016,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.2999992370605469, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 246.30000019073486, 244.30000019073486, 241.69999980926514,+ 243.30000019073486, 237.39999961853027, 248.39999961853027,+ 244.80000019073486, 244.19999980926514, 237.80000019073486,+ 243.30000019073486, 237.69999980926514, 231.5, 246.4000005722046,+ 241.0999994277954, 243.4000005722046, 241.19999980926514,+ 246.30000019073486, 235.10000038146973, 233.10000038146973,+ 235.39999961853027, 234, 237.69999980926514, 244.19999980926514,+ 246.0999994277954, 239.5, 243.0999994277954, 233.9000005722046,+ 232.69999980926514, 236.0999994277954, 242.60000038146973,+ 234.0999994277954, 233.9000005722046, 234.19999980926514,+ 231.80000019073486, 235.19999980926514, 233.60000038146973,+ 234.5999994277954, 230.9000005722046, 236.89999961853027,+ 240.60000038146973+ ],+ "median": 237.75,+ "p95": 246.30000019073486+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.10000038146972656, 0, 0, 0, 0.09999942779541016, 0, 0, 0,+ 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0,+ 0, 0, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0, 0,+ 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0+ ],+ "median": 0,+ "p95": 0.10000038146972656+ },+ "completedMs": {+ "samples": [+ 0.10000038146972656, 0.19999980926513672, 0, 0.10000038146972656,+ 0.09999942779541016, 0.20000076293945312, 0.09999942779541016, 0,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656, 0,+ 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0, 0.19999980926513672, 0, 0,+ 0.09999942779541016, 0, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,+ 0.10000038146972656, 0.09999942779541016, 0, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.19999980926513672, 0, 0.09999942779541016, 0.10000038146972656,+ 0.10000038146972656, 0.09999942779541016+ ],+ "median": 0.09999942779541016,+ "p95": 0.19999980926513672+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ }+ },+ "pixelTestDuration": {+ "before": {+ "milliseconds": [2745, 2733, 2788, 2687, 2783],+ "median": 2745,+ "runs": 5+ },+ "after": {+ "milliseconds": [1739, 1775, 1757, 1744, 1711],+ "median": 1744,+ "runs": 5+ }+ }+}diff --git a/docs/screenshots/color-mixer-hue.png b/docs/screenshots/color-mixer-hue.pngnew file mode 100644index 0000000..3a56e1eBinary files /dev/null and b/docs/screenshots/color-mixer-hue.png differdiff --git a/docs/screenshots/color-mixer-luminance.png b/docs/screenshots/color-mixer-luminance.pngnew file mode 100644index 0000000..f755bb5Binary files /dev/null and b/docs/screenshots/color-mixer-luminance.png differdiff --git a/docs/screenshots/color-mixer-saturation.png b/docs/screenshots/color-mixer-saturation.pngnew file mode 100644index 0000000..97e712bBinary files /dev/null and b/docs/screenshots/color-mixer-saturation.png differdiff --git a/playwright.bench.config.ts b/playwright.bench.config.tsnew file mode 100644index 0000000..49be3c6--- /dev/null+++ b/playwright.bench.config.ts@@ -0,0 +1,9 @@+import { defineConfig } from "@playwright/test";+import config from "./playwright.config";++export default defineConfig(config, {+ testMatch: "**/*.bench.ts",+ workers: 1,+ timeout: 180_000,+ outputDir: "test-results/benchmarks",+});diff --git a/playwright.config.ts b/playwright.config.tsindex 0bcace3..5dc080e 100644--- a/playwright.config.ts+++ b/playwright.config.ts@@ -4,6 +4,15 @@ const args = ["--enable-unsafe-webgpu"];if (process.platform !== "darwin") {args.push("--use-webgpu-adapter=swiftshader");}+if (process.platform === "linux") {+ // Canvas presentation and image copies must use the same software Vulkan backend.+ args.push(+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface",+ );+}export default defineConfig({testDir: "./tests",diff --git a/src/app/controls.ts b/src/app/controls.tsindex 5f11dbf..d06579e 100644--- a/src/app/controls.ts+++ b/src/app/controls.ts@@ -7,6 +7,12 @@ import { createCameraRawXmpLoader } from "@/app/loaders/camera-raw-xmp";import { createImageLoader } from "@/app/loaders/image";import { createLoaderRegistry } from "@/app/loaders/registry";import type { Workspace } from "@/app/workspace";+import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";+import {+ defaultMixer,+ type MixerChange,+ type MixerColor,+} from "@/features/color-mixer/model";import { setWhiteBalance } from "@/features/white-balance/edits";import type { Preview } from "@/lib/editor/document";import { setAdjustments, setToneCurve } from "@/lib/editor/document/edits";@@ -38,6 +44,9 @@ export function createControls(gpu: Gpu, workspace: Workspace) {setWhiteBalance(workspace.getDocument(), change),setToneCurve: (curve?: ToneCurve) =>setToneCurve(workspace.getDocument(), curve),+ setColorMixer: (color: MixerColor, change: MixerChange) =>+ setColorMixer(workspace.getDocument(), color, change),+ resetColorMixer: () => resetColorMixer(workspace.getDocument()),editScene(change: Partial<Scene>) {const document = workspace.getDocument();document.edit({ ...document.scene.getState(), ...change });@@ -63,6 +72,7 @@ export function createControls(gpu: Gpu, workspace: Workspace) {adjustments: scene?.adjustments ?? defaultAdjustments,whiteBalance: scene?.whiteBalance,toneCurve: scene?.toneCurve ?? defaultCurve,+ colorMixer: scene?.colorMixer ?? defaultMixer,history: document?.history.status.getState() ?? {undoCount: 0,redoCount: 0,diff --git a/src/app/editor/adjust/adjustment-controls.tsx b/src/app/editor/adjust/adjustment-controls.tsxindex 851dd20..948d289 100644--- a/src/app/editor/adjust/adjustment-controls.tsx+++ b/src/app/editor/adjust/adjustment-controls.tsx@@ -67,7 +67,13 @@ function ColorTemperatureControls() {);}-export default function AdjustmentControls({ curves }: { curves: ReactNode }) {+export default function AdjustmentControls({+ curves,+ colorMixer,+}: {+ curves: ReactNode;+ colorMixer: ReactNode;+}) {return (<><Collapsible title="Light">@@ -96,6 +102,7 @@ export default function AdjustmentControls({ curves }: { curves: ReactNode }) {/></div></Collapsible>+ {colorMixer}<Collapsible title="Details"><div className="flex flex-col gap-2"><AdjustmentSlider name="clarity" label="Clarity" />diff --git a/src/app/editor/adjust/index.tsx b/src/app/editor/adjust/index.tsxindex 18089c0..afa0ffd 100644--- a/src/app/editor/adjust/index.tsx+++ b/src/app/editor/adjust/index.tsx@@ -7,6 +7,7 @@ import {useDocument,useScene,} from "@/components/editor/session";+import { ColorMixerControls } from "@/features/color-mixer/controls";import { Histogram } from "@/features/histogram";import { createHistogram } from "@/features/histogram/histogram";import { ToneCurves } from "@/features/tone-curves/tone-curves";@@ -73,6 +74,7 @@ export function AdjustPanel() {</section><AdjustmentControlscurves={<ToneCurvesPanel histogram={histogram} />}+ colorMixer={<ColorMixerControls />}/></div><EditorActions />diff --git a/src/app/editor/export/export-image.ts b/src/app/editor/export/export-image.tsindex 80b6385..b289096 100644--- a/src/app/editor/export/export-image.ts+++ b/src/app/editor/export/export-image.ts@@ -1,6 +1,6 @@import { frame, type Gpu, surface, type Target } from "vgpu";+import { createEditorRenderer } from "@/app/editor/renderer";import type { EditorDocument } from "@/lib/editor/document";-import { createRenderer } from "@/lib/editor/renderer";import { createDisplay } from "@/lib/image-display";import type { Point } from "@/lib/image-frame/geometry";@@ -112,7 +112,7 @@ export async function exportImage() {const scene = document.scene.getState();const source = document.resources.get(scene.source);- const renderer = createRenderer(gpu, source);+ const renderer = createEditorRenderer(gpu, source);try {await renderer.update(scene);// The renderer retains the source until encoding finishes.diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsxindex 4cd55d7..794ff96 100644--- a/src/app/editor/index.tsx+++ b/src/app/editor/index.tsx@@ -6,6 +6,7 @@ import Spinner from "@/components/ui/spinner";import { EditorCanvas } from "./canvas";import { ModeRail } from "./mode-rail";import { ModeProvider, useMode } from "./modes";+import { createEditorRenderer } from "./renderer";function ModeView() {const { mode } = useMode();@@ -45,7 +46,7 @@ function EditorContent({ state }: EditorProps) {if (state.status === "ready") {return (<DocumentProvider key={state.document.id} value={state.document}>- <RendererProvider>+ <RendererProvider createRenderer={createEditorRenderer}><DocumentEditor /></RendererProvider></DocumentProvider>diff --git a/src/app/editor/renderer.ts b/src/app/editor/renderer.tsnew file mode 100644index 0000000..c8a84d6--- /dev/null+++ b/src/app/editor/renderer.ts@@ -0,0 +1,9 @@+import type { Gpu } from "vgpu";+import { createColorMixer } from "@/features/color-mixer/pass";+import { createRenderer } from "@/lib/editor/renderer";+import type { ImageSource } from "@/lib/image-source";++/** The same feature composition powers the editing preview and export. */+export function createEditorRenderer(gpu: Gpu, source: ImageSource) {+ return createRenderer(gpu, source, createColorMixer);+}diff --git a/src/components/editor/pipeline.tsx b/src/components/editor/pipeline.tsxindex 2c61b45..037e7bf 100644--- a/src/components/editor/pipeline.tsx+++ b/src/components/editor/pipeline.tsx@@ -8,7 +8,7 @@ import {} from "react";import { useGpu } from "vgpu-react";import { useDocument, useScene } from "@/components/editor/session";-import { createRenderer } from "@/lib/editor/renderer";+import type { createRenderer } from "@/lib/editor/renderer";const RendererContext = createContext<ReturnType<typeof createRenderer> | null>(null,@@ -33,14 +33,23 @@ function RendererError({ message }: { message: string }) {);}-type RendererProviderProps = { children: ReactNode };+type RendererProviderProps = {+ children: ReactNode;+ createRenderer: typeof createRenderer;+};-export function RendererProvider({ children }: RendererProviderProps) {+export function RendererProvider({+ children,+ createRenderer,+}: RendererProviderProps) {const gpu = useGpu();const document = useDocument();const sourceId = useScene((scene) => scene.source);const source = document.resources.get(sourceId);- const renderer = useMemo(() => createRenderer(gpu, source), [gpu, source]);+ const renderer = useMemo(+ () => createRenderer(gpu, source),+ [gpu, source, createRenderer],+ );const [error, setError] = useState<string>();useEffect(() => {diff --git a/src/components/ui/scrub-input.tsx b/src/components/ui/scrub-input.tsxindex 2ee9c01..c196e01 100644--- a/src/components/ui/scrub-input.tsx+++ b/src/components/ui/scrub-input.tsx@@ -1,4 +1,5 @@import { cva } from "class-variance-authority";+import { cn } from "cn";import {type ComponentProps,type PointerEvent,@@ -45,6 +46,7 @@ export function ScrubInput({max,step = 1,variant = "box",+ className,...props}: ScrubInputProps) {const decimals = `${step}`.split(".")[1]?.length ?? 0;@@ -97,9 +99,14 @@ export function ScrubInput({};return (- <label className="flex items-center gap-2 text-neutral-400 text-sm">+ <label+ className={cn(+ "flex items-center gap-2 text-neutral-400 text-sm",+ className,+ )}+ >{label}- <Field className="w-16" variant={variant}>+ <Field className="w-16 max-w-full" variant={variant}><input{...props}className={input({ variant })}diff --git a/src/components/ui/vertical-slider.tsx b/src/components/ui/vertical-slider.tsxnew file mode 100644index 0000000..3a2a2fe--- /dev/null+++ b/src/components/ui/vertical-slider.tsx@@ -0,0 +1,45 @@+type VerticalSliderProps = {+ label: string;+ value: number;+ onChange: (value: number) => void;+ min: number;+ max: number;+ defaultValue?: number;+ stops: readonly string[];+ color: string;+};++/** Native vertical range: up increases, down decreases, double-click restores the default. */+export function VerticalSlider({+ label,+ value,+ onChange,+ min,+ max,+ defaultValue,+ stops,+ color,+}: VerticalSliderProps) {+ return (+ <div className="relative flex h-44 w-full justify-center">+ <div+ className="pointer-events-none absolute inset-y-2 w-1 rounded-full shadow-groove"+ style={{ background: `linear-gradient(to top, ${stops.join()})` }}+ />+ <input+ aria-label={label}+ aria-orientation="vertical"+ className="relative h-full w-full touch-none cursor-ns-resize appearance-none bg-transparent [direction:rtl] [writing-mode:vertical-lr] focus-visible:outline-1 focus-visible:outline-offset-2 focus-visible:outline-neutral-400 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:size-4 [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-current [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-black/30 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-4 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-current [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-black/30"+ style={{ color }}+ type="range"+ min={min}+ max={max}+ value={value}+ onChange={(event) => onChange(event.currentTarget.valueAsNumber)}+ onDoubleClick={() =>+ defaultValue !== undefined && onChange(defaultValue)+ }+ />+ </div>+ );+}diff --git a/src/features/color-mixer/controls.tsx b/src/features/color-mixer/controls.tsxnew file mode 100644index 0000000..0cd509c--- /dev/null+++ b/src/features/color-mixer/controls.tsx@@ -0,0 +1,105 @@+import { useId, useState } from "react";+import { useDocument, useScene } from "@/components/editor/session";+import { Collapsible } from "@/components/ui/collapsible";+import { ScrubInput } from "@/components/ui/scrub-input";+import { Tab, TabList } from "@/components/ui/tabs";+import { VerticalSlider } from "@/components/ui/vertical-slider";+import { setColorMixer } from "./edits";+import { channels, colors, defaultMixer, type MixerChannel } from "./model";++function gradient(hue: number, channel: MixerChannel) {+ if (channel === "hue") {+ return [-30, 0, 30].map((shift) => `hsl(${hue + shift} 65% 55%)`);+ }+ if (channel === "saturation") {+ return [0, 50, 100].map((saturation) => `hsl(${hue} ${saturation}% 55%)`);+ }+ return [20, 55, 85].map((lightness) => `hsl(${hue} 65% ${lightness}%)`);+}++function ColorSlider({+ index,+ channel,+}: {+ index: number;+ channel: MixerChannel;+}) {+ const document = useDocument();+ const value = useScene(+ (scene) => (scene.colorMixer ?? defaultMixer)[channel][index],+ );+ const color = colors[index];+ const label = `${color.label} ${channel}`;+ const change = (value: number) =>+ setColorMixer(document, color.id, { [channel]: value });+ return (+ <div+ className="flex min-w-0 flex-col items-center gap-1"+ title={color.label}+ >+ <ScrubInput+ aria-label={`${label} value`}+ className="w-full leading-4 [&>span]:px-0 [&_input]:text-center [&_input]:text-[11px] [&_input]:tracking-tight"+ variant="text"+ value={value}+ onChange={change}+ min={-100}+ max={100}+ />+ <VerticalSlider+ label={label}+ value={value}+ onChange={change}+ min={-100}+ max={100}+ defaultValue={0}+ stops={gradient(color.hue, channel)}+ color={`hsl(${color.hue} 65% 55%)`}+ />+ </div>+ );+}++function MixerPanel() {+ const [channel, setChannel] = useState<MixerChannel>("hue");+ const id = useId();+ return (+ <>+ <TabList+ aria-label="Color Mixer adjustment"+ className="mb-3 gap-0.5 rounded-md bg-neutral-900 p-0.5 shadow-groove"+ >+ {channels.map(({ id: value, label }) => (+ <Tab+ key={value}+ id={`${id}-${value}`}+ aria-controls={`${id}-sliders`}+ selected={channel === value}+ onClick={() => setChannel(value)}+ className="min-w-0 flex-1 rounded px-1 py-1.5"+ >+ {label}+ </Tab>+ ))}+ </TabList>+ <div+ id={`${id}-sliders`}+ role="tabpanel"+ aria-labelledby={`${id}-${channel}`}+ className="grid grid-cols-8"+ >+ {colors.map((color, index) => (+ <ColorSlider key={color.id} index={index} channel={channel} />+ ))}+ </div>+ </>+ );+}++export function ColorMixerControls() {+ return (+ <Collapsible title="Color Mixer">+ <MixerPanel />+ </Collapsible>+ );+}diff --git a/src/features/color-mixer/edits.ts b/src/features/color-mixer/edits.tsnew file mode 100644index 0000000..6c4ca1f--- /dev/null+++ b/src/features/color-mixer/edits.ts@@ -0,0 +1,50 @@+import type { EditorDocument } from "@/lib/editor/document";+import {+ channels,+ colors,+ defaultMixer,+ isNeutral,+ type MixerChange,+ type MixerColor,+} from "./model";++export function setColorMixer(+ document: EditorDocument,+ color: MixerColor,+ change: MixerChange,+) {+ const index = colors.findIndex(({ id }) => id === color);+ if (index < 0) {+ throw new Error(`Invalid color range: ${color}.`);+ }+ for (const [name, value] of Object.entries(change)) {+ if (+ !channels.some(({ id }) => id === name) ||+ typeof value !== "number" ||+ !Number.isFinite(value) ||+ Math.abs(value) > 100+ ) {+ throw new Error(`Invalid color mixer adjustment: ${name}.`);+ }+ }+ const scene = document.scene.getState();+ const current = scene.colorMixer ?? defaultMixer;+ const next = { ...current };+ for (const { id } of channels) {+ const value = change[id];+ if (value !== undefined && value !== current[id][index]) {+ next[id] = current[id].with(index, value);+ }+ }+ if (channels.every(({ id }) => current[id] === next[id])) {+ return;+ }+ document.edit({ ...scene, colorMixer: isNeutral(next) ? undefined : next });+}++export function resetColorMixer(document: EditorDocument) {+ const scene = document.scene.getState();+ if (scene.colorMixer) {+ document.edit({ ...scene, colorMixer: undefined });+ }+}diff --git a/src/features/color-mixer/mixer.wgsl b/src/features/color-mixer/mixer.wgslnew file mode 100644index 0000000..4085862--- /dev/null+++ b/src/features/color-mixer/mixer.wgsl@@ -0,0 +1,70 @@+import { luminance, rec2020ToSrgb, srgbToRec2020 } from "../../lib/color.wgsl";++// Selective color in Oklab: at +/-100 a range turns hue 30 degrees, scales chroma 0..2x or moves luminance one stop.+// The import above is relative because the shader loader does not resolve the `@/` alias.++@group(0) @binding(0) var source: texture_2d<f32>;+@group(0) @binding(1) var<storage, read> settings: array<vec4f>;++// Bjorn Ottosson's public-domain Oklab transforms (2021 matrices):+// https://bottosson.github.io/posts/oklab/+fn toOklab(rgb: vec3f) -> vec3f {+ let lms = mat3x3f(+ 0.4122214708, 0.2119034982, 0.0883024619,+ 0.5363325363, 0.6806995451, 0.2817188376,+ 0.0514459929, 0.1073969566, 0.6299787005,+ ) * rgb;+ return mat3x3f(+ 0.2104542553, 1.9779984951, 0.0259040371,+ 0.7936177850, -2.4285922050, 0.7827717662,+ -0.0040720468, 0.4505937099, -0.8086757660,+ ) * (sign(lms) * pow(abs(lms), vec3f(1.0 / 3.0)));+}++fn fromOklab(lab: vec3f) -> vec3f {+ let lms = mat3x3f(+ 1.0, 1.0, 1.0,+ 0.3963377774, -0.1055613458, -0.0894841775,+ 0.2158037573, -0.0638541728, -1.2914855480,+ ) * lab;+ return mat3x3f(+ 4.0767416621, -1.2684380046, -0.0041960863,+ -3.3077115913, 2.6097574011, -0.7034186147,+ 0.2309699292, -0.3413193965, 1.7076147010,+ ) * (lms * lms * lms);+}++// Adjacent ranges crossfade once, including magenta -> red across the hue seam.+fn adjustment(hue: f32) -> vec3f {+ let angle = select(hue, hue + 360.0, hue < settings[0].w);+ for (var i = 0u; i < 8u; i++) {+ let next = (i + 1u) % 8u;+ let end = settings[next].w + select(0.0, 360.0, next == 0u);+ if (angle >= settings[i].w && angle <= end) {+ return mix(settings[i].xyz, settings[next].xyz, smoothstep(settings[i].w, end, angle));+ }+ }+ return vec3f(0.0);+}++fn mixColor(color: vec3f) -> vec3f {+ let light = luminance(color);+ if (light <= 0.0) { return color; }+ let lab = toOklab(rec2020ToSrgb * color);+ // Fade the selection near neutral so tiny chroma/noise cannot tint gray areas.+ let strength = smoothstep(0.01, 0.04, length(lab.yz) / max(abs(lab.x), 0.000001));+ let change = adjustment(degrees(atan2(lab.z, lab.y))) * (strength / 100.0);+ if (all(change == vec3f(0.0))) { return color; }+ let angle = radians(change.x * 30.0);+ let rotation = mat2x2f(cos(angle), sin(angle), -sin(angle), cos(angle));+ let chroma = rotation * lab.yz * (1.0 + change.y);+ let mixed = srgbToRec2020 * fromOklab(vec3f(lab.x, chroma));+ // Preserve linear luminance during hue/chroma edits; luminance spans +/- one stop.+ // Keep extended RGB and HDR headroom for the existing display gamut mapping.+ return (mixed + vec3f(light - luminance(mixed))) * exp2(change.z);+}++@fragment fn fs_main(@builtin(position) position: vec4f) -> @location(0) vec4f {+ let input = textureLoad(source, vec2i(position.xy), 0);+ return vec4f(mixColor(input.rgb), input.a);+}diff --git a/src/features/color-mixer/model.ts b/src/features/color-mixer/model.tsnew file mode 100644index 0000000..050daa9--- /dev/null+++ b/src/features/color-mixer/model.ts@@ -0,0 +1,34 @@+import type { ColorMixer } from "@/lib/editor/scene";++// Oklab angles of the eight full-saturation sRGB colors, for circular interpolation.+export const colors = [+ { id: "red", label: "Red", hue: 0, angle: 29.23389 },+ { id: "orange", label: "Orange", hue: 30, angle: 52.77574 },+ { id: "yellow", label: "Yellow", hue: 60, angle: 109.76923 },+ { id: "green", label: "Green", hue: 120, angle: 142.49534 },+ { id: "aqua", label: "Aqua", hue: 180, angle: 194.76895 },+ { id: "blue", label: "Blue", hue: 240, angle: 264.05202 },+ { id: "purple", label: "Purple", hue: 270, angle: 293.77405 },+ { id: "magenta", label: "Magenta", hue: 300, angle: 328.36342 },+] as const;++export const channels = [+ { id: "hue", label: "Hue" },+ { id: "saturation", label: "Saturation" },+ { id: "luminance", label: "Luminance" },+] as const;++export type MixerColor = (typeof colors)[number]["id"];+export type MixerChannel = keyof ColorMixer;+export type MixerChange = Partial<Record<MixerChannel, number>>;++const zeros = Object.freeze(colors.map(() => 0));+export const defaultMixer: ColorMixer = Object.freeze({+ hue: zeros,+ saturation: zeros,+ luminance: zeros,+});++export function isNeutral(mixer: ColorMixer) {+ return channels.every(({ id }) => mixer[id].every((value) => value === 0));+}diff --git a/src/features/color-mixer/pass.ts b/src/features/color-mixer/pass.tsnew file mode 100644index 0000000..a0dc925--- /dev/null+++ b/src/features/color-mixer/pass.ts@@ -0,0 +1,39 @@+import { effect, type Gpu, type Target, target } from "vgpu";+import type { SceneEffect } from "@/lib/editor/renderer";+import shader from "./mixer.wgsl";+import { colors, isNeutral } from "./model";++/** Each renderer owns its output and reuses the same mixer pipeline. */+export function createColorMixer(gpu: Gpu, source: Target): SceneEffect {+ let output: Target | undefined;+ const settings = gpu.device.createBuffer({+ size: colors.length * 4 * Float32Array.BYTES_PER_ELEMENT,+ usage: ["storage", "copy_dst"],+ });+ const apply = effect(gpu, shader, { set: { settings } });+ return {+ render(frame, input, scene) {+ const mixer = scene.colorMixer;+ if (!mixer || isNeutral(mixer)) {+ return input;+ }+ output ??= target(gpu, { size: source.size, format: source.format });+ settings.write(+ new Float32Array(+ colors.flatMap(({ angle }, index) => [+ mixer.hue[index],+ mixer.saturation[index],+ mixer.luminance[index],+ angle,+ ]),+ ),+ );+ frame.pass(output, apply.set({ source: input.color }));+ return output;+ },+ dispose() {+ output?.color.dispose();+ settings.dispose();+ },+ };+}diff --git a/src/lib/editor/document/index.ts b/src/lib/editor/document/index.tsindex f4ce874..3a6dedb 100644--- a/src/lib/editor/document/index.ts+++ b/src/lib/editor/document/index.ts@@ -18,6 +18,9 @@ function equal(a: Scene, b: Scene) {shallow(frameValues(a.frame), frameValues(b.frame)) &&shallow(a.adjustments, b.adjustments) &&shallow(a.whiteBalance, b.whiteBalance) &&+ shallow(a.colorMixer?.hue, b.colorMixer?.hue) &&+ shallow(a.colorMixer?.saturation, b.colorMixer?.saturation) &&+ shallow(a.colorMixer?.luminance, b.colorMixer?.luminance) &&a.toneCurve.length === b.toneCurve.length &&a.toneCurve.every((point, i) => shallow(point, b.toneCurve[i])));diff --git a/src/lib/editor/renderer.ts b/src/lib/editor/renderer.tsindex e965764..3acbdb3 100644--- a/src/lib/editor/renderer.ts+++ b/src/lib/editor/renderer.ts@@ -1,4 +1,4 @@-import { frame, type Gpu } from "vgpu";+import { type Frame, frame, type Gpu, type Target } from "vgpu";import { createAdjustments } from "@/lib/adjustments";import type { Scene } from "@/lib/editor/scene";import { createImageFrame } from "@/lib/image-frame";@@ -6,18 +6,29 @@ import type { ImageSource, WhiteBalance } from "@/lib/image-source";import { createToneCurves } from "@/lib/tone-curves";import { createUnsharpMask } from "@/lib/unsharp-mask";+/** An optional document effect, composed after curves and before detail filtering. */+export type SceneEffect = {+ render(frame: Frame, input: Target, scene: Scene): Target;+ dispose(): void;+};+function sameBalance(a: WhiteBalance | undefined, b: WhiteBalance | undefined) {return a?.temperature === b?.temperature && a?.tint === b?.tint;}/** Owns scene passes and intermediate textures for one decoded source. */-export function createRenderer(gpu: Gpu, resource: ImageSource) {+export function createRenderer(+ gpu: Gpu,+ resource: ImageSource,+ createEffect?: (gpu: Gpu, source: Target) => SceneEffect,+) {const source = resource.image;const adjust = createAdjustments(gpu, source);const adjusted = adjust.output;const toneCurves = createToneCurves(gpu, adjusted);const clarity = createUnsharpMask(gpu, source, 16);const sharpen = createUnsharpMask(gpu, source);+ const effect = createEffect?.(gpu, source);const transform = createImageFrame(gpu);const release = resource.retain();@@ -37,8 +48,9 @@ export function createRenderer(gpu: Gpu, resource: ImageSource) {const developed = raw?.render() ?? source;adjust.render(frame, scene.adjustments, developed);const curved = toneCurves.render(frame, scene.toneCurve);+ const colored = effect?.render(frame, curved, scene) ?? curved;const { clarity: amount, sharpening, sharpenRadius } = scene.adjustments;- const clarified = clarity.render(frame, curved, amount / 200, 64);+ const clarified = clarity.render(frame, colored, amount / 200, 64);fullImage = sharpen.render(frame,clarified,@@ -123,6 +135,7 @@ export function createRenderer(gpu: Gpu, resource: ImageSource) {toneCurves.dispose();clarity.dispose();sharpen.dispose();+ effect?.dispose();transform.dispose();raw?.dispose();release();diff --git a/src/lib/editor/scene.ts b/src/lib/editor/scene.tsindex 5e18901..7da65fd 100644--- a/src/lib/editor/scene.ts+++ b/src/lib/editor/scene.ts@@ -46,6 +46,13 @@ export const adjustmentMinimums: Partial<Adjustments> = {sharpenRadius: 0.5,};+/** Eight color ranges, ordered red through magenta; values use -100..100 UI units. */+export type ColorMixer = {+ readonly hue: readonly number[];+ readonly saturation: readonly number[];+ readonly luminance: readonly number[];+};+/** Serializable document content. Image bytes and GPU resources live elsewhere. */export type Scene = {readonly frame: ImageFrame;@@ -53,4 +60,5 @@ export type Scene = {readonly whiteBalance?: Readonly<WhiteBalance>;readonly adjustments: Readonly<Adjustments>;readonly toneCurve: ToneCurve;+ readonly colorMixer?: ColorMixer;};diff --git a/tests/color-mixer-editing.ts b/tests/color-mixer-editing.tsnew file mode 100644index 0000000..dea7e7a--- /dev/null+++ b/tests/color-mixer-editing.ts@@ -0,0 +1,79 @@+import type { Page } from "@playwright/test";+import { expect, test } from "./fixtures";+import { box, drag } from "./pointer";++export async function colorMixerEditing(page: Page) {+ const state = () => page.evaluate(() => window.openlight.getState());+ await test.step("color mixer switches channels, groups vertical drags, exports selected colors and resets", async () => {+ const before = (await state()).history.undoCount;+ const hue = page.getByRole("slider", { name: "Blue hue", exact: true });+ await hue.scrollIntoViewIfNeeded();+ await expect(hue).toHaveAttribute("aria-orientation", "vertical");+ const bounds = await box(hue);+ expect(bounds.height).toBeGreaterThan(bounds.width * 3);+ await hue.press("ArrowUp");+ await expect(hue).toHaveValue("1");+ expect((await state()).history.undoCount).toBe(before + 1);+ await page.keyboard.press("ControlOrMeta+z");+ await expect(hue).toHaveValue("0");+ const beforeTabs = await state();+ await page+ .getByRole("tab", { name: "Hue", exact: true })+ .press("ArrowRight");+ await expect(+ page.getByRole("tab", { name: "Saturation", exact: true }),+ ).toHaveAttribute("aria-selected", "true");+ expect(await state()).toEqual(beforeTabs);+ const saturation = page.getByRole("slider", {+ name: "Blue saturation",+ exact: true,+ });+ const track = await box(saturation);+ await drag(+ page,+ [track.x + track.width / 2, track.y + track.height / 2],+ [track.x + track.width / 2, track.y + track.height / 4],+ );+ const dragged = (await state()).colorMixer.saturation[5];+ expect(dragged).toBeGreaterThan(0);+ expect((await state()).history.undoCount).toBe(before + 1);+ await page.keyboard.press("ControlOrMeta+z");+ await expect(saturation).toHaveValue("0");+ await page.keyboard.press("ControlOrMeta+Shift+z");+ await expect(saturation).toHaveValue(String(dragged));+ const numeric = page.getByRole("textbox", {+ name: "Blue saturation value",+ exact: true,+ });+ await numeric.fill("-100");+ await numeric.press("Enter");+ await expect(saturation).toHaveValue("-100");+ const pixel = await page.evaluate(async () => {+ const bitmap = await createImageBitmap(+ await window.openlight.exportImage(),+ );+ const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read color mixer export.");+ context.drawImage(bitmap, 0, 0);+ bitmap.close();+ return [...context.getImageData(350, 200, 1, 1).data];+ });+ for (const channel of pixel.slice(0, 3)) {+ expect(Math.abs(channel - 79)).toBeLessThanOrEqual(2);+ }+ expect(pixel[3]).toBe(255);+ await page.getByRole("tab", { name: "Luminance", exact: true }).click();+ await expect(+ page.getByRole("slider", { name: "Blue luminance", exact: true }),+ ).toHaveValue("0");+ await page.getByRole("tab", { name: "Saturation", exact: true }).click();+ await expect(saturation).toHaveValue("-100");+ await saturation.dblclick();+ await expect(saturation).toHaveValue("0");+ await page.keyboard.press("ControlOrMeta+z");+ await expect(saturation).toHaveValue("-100");+ await page.keyboard.press("ControlOrMeta+Shift+z");+ await expect(saturation).toHaveValue("0");+ });+}diff --git a/tests/color-mixer-gpu.ts b/tests/color-mixer-gpu.tsnew file mode 100644index 0000000..b435762--- /dev/null+++ b/tests/color-mixer-gpu.ts@@ -0,0 +1,114 @@+import { effect, frame, init, target } from "vgpu";+import { colors, defaultMixer } from "@/features/color-mixer/model";+import { createColorMixer } from "@/features/color-mixer/pass";+import { type ColorMixer, defaultAdjustments } from "@/lib/editor/scene";+import { imageFrame } from "@/lib/image-frame/geometry";+import { defaultCurve } from "@/lib/tone-curves/curve";++function working(rgb: number[], scale = 1) {+ const [r, g, b] = rgb.map((value) =>+ value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4,+ );+ return [+ (0.6274 * r + 0.3293 * g + 0.0433 * b) * scale,+ (0.0691 * r + 0.9195 * g + 0.0114 * b) * scale,+ (0.0164 * r + 0.088 * g + 0.8956 * b) * scale,+ 0.5,+ ];+}++/** Exercise the actual shader in the editor's float16 working space, before display clipping. */+export async function probeColorMixer() {+ const gpu = await init();+ const samples = [+ ...[+ [1, 0, 0],+ [1, 0.5, 0],+ [1, 1, 0],+ [0, 1, 0],+ [0, 1, 1],+ [0, 0, 1],+ [0.5, 0, 1],+ [1, 0, 1],+ ].map((rgb) => working(rgb)),+ [0, 0, 0, 0],+ [0.18, 0.18, 0.18, 1],+ [2, 2, 2, 1],+ working([1, 0, 0], 4),+ working([0, 1, 1], 4),+ [0, 1, 0, 1],+ ];+ const ramp = Array.from({ length: 360 }, (_, hue) => {+ const rgb = [0, 8, 4].map((offset) => {+ const k = (offset + hue / 30) % 12;+ return 0.5 - 0.3 * Math.max(-1, Math.min(k - 3, 9 - k, 1));+ });+ return working(rgb);+ });+ const input = target(gpu, {+ size: [samples.length + ramp.length, 1],+ format: "rgba16float",+ });+ const data = gpu.device.createBuffer({+ size: input.size[0] * 16,+ usage: ["storage", "copy_dst"],+ });+ data.write(new Float32Array([...samples, ...ramp].flat()));+ const fill = effect(+ gpu,+ `+ @group(0) @binding(0) var<storage, read> samples: array<vec4f>;+ @fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {+ return samples[u32(p.x)];+ }+ `,+ { set: { samples: data } },+ );+ const mixer = createColorMixer(gpu, input);+ const scene = {+ source: "probe",+ frame: imageFrame(input.size),+ adjustments: defaultAdjustments,+ toneCurve: defaultCurve,+ };+ const uniform = (channel: keyof ColorMixer, value: number): ColorMixer => ({+ ...defaultMixer,+ [channel]: colors.map(() => value),+ });+ const selected = (+ index: number,+ channel: keyof ColorMixer,+ value: number,+ ): ColorMixer => ({+ ...defaultMixer,+ [channel]: colors.map((_, i) => (i === index ? value : 0)),+ });+ try {+ frame(gpu, (f) => f.pass(input, fill));+ await gpu.gpu.queue.onSubmittedWorkDone();+ const original = [...(await input.readFloats())];+ const outputs = [];+ for (const colorMixer of [+ defaultMixer,+ uniform("hue", 100),+ uniform("hue", -100),+ uniform("saturation", -100),+ uniform("luminance", 100),+ uniform("luminance", -100),+ selected(5, "saturation", -100),+ selected(0, "hue", 100),+ ]) {+ let output = input;+ frame(gpu, (f) => {+ output = mixer.render(f, input, { ...scene, colorMixer });+ });+ outputs.push([...(await output.readFloats())]);+ }+ return { original, outputs, sampleCount: samples.length };+ } finally {+ mixer.dispose();+ input.color.dispose();+ data.dispose();+ gpu.dispose();+ }+}diff --git a/tests/color-mixer.e2e.ts b/tests/color-mixer.e2e.tsnew file mode 100644index 0000000..0bd67e2--- /dev/null+++ b/tests/color-mixer.e2e.ts@@ -0,0 +1,71 @@+import { expect, test } from "./fixtures";++function luminance(rgb: number[]) {+ return rgb[0] * 0.2627 + rgb[1] * 0.678 + rgb[2] * 0.0593;+}++test("color mixing preserves luminance, neutrals, alpha and HDR, isolates ranges and joins the hue seam", async ({+ page,+}) => {+ await page.goto("/tests/gpu.html");+ const { original, outputs, sampleCount } = await page.evaluate(async () => {+ const path = "/tests/color-mixer-gpu.ts";+ const { probeColorMixer } = (await import(+ path+ )) as typeof import("./color-mixer-gpu");+ return probeColorMixer();+ });+ const [neutral, hueUp, hueDown, gray, lighter, darker, blue, red] = outputs;+ expect(neutral).toEqual(original);+ for (const output of outputs) {+ expect(output.every(Number.isFinite)).toBe(true);+ for (let i = 3; i < output.length; i += 4) {+ expect(output[i]).toBe(original[i]);+ }+ for (const index of [8, 9, 10]) {+ expect(output.slice(index * 4, index * 4 + 4)).toEqual(+ original.slice(index * 4, index * 4 + 4),+ );+ }+ }+ for (let index = 0; index < sampleCount; index++) {+ const input = original.slice(index * 4, index * 4 + 3);+ const light = luminance(input);+ for (const output of [hueUp, hueDown, gray]) {+ expect(+ Math.abs(luminance(output.slice(index * 4, index * 4 + 3)) - light),+ ).toBeLessThan(0.003);+ }+ if (index >= 8 && index <= 10) continue;+ for (let channel = 0; channel < 3; channel++) {+ expect(Math.abs(gray[index * 4 + channel] - light)).toBeLessThan(0.003);+ expect(+ Math.abs(lighter[index * 4 + channel] - input[channel] * 2),+ ).toBeLessThan(0.006);+ expect(+ Math.abs(darker[index * 4 + channel] - input[channel] / 2),+ ).toBeLessThan(0.003);+ }+ }+ for (const index of [0, 1, 2, 3, 4, 7]) {+ for (let channel = 0; channel < 3; channel++) {+ expect(+ Math.abs(blue[index * 4 + channel] - original[index * 4 + channel]),+ ).toBeLessThan(0.003);+ }+ }+ const blueLight = luminance(original.slice(20, 23));+ for (const channel of blue.slice(20, 23)) {+ expect(Math.abs(channel - blueLight)).toBeLessThan(0.003);+ }+ expect(Math.max(...lighter.slice(44, 47))).toBeGreaterThan(4);+ expect(hueUp[1]).toBeGreaterThan(original[1]);+ expect(hueDown[2]).toBeGreaterThan(original[2]);+ for (let i = 0; i < 360; i++) {+ for (let channel = 0; channel < 3; channel++) {+ const a = red[(sampleCount + i) * 4 + channel];+ const b = red[(sampleCount + ((i + 1) % 360)) * 4 + channel];+ expect(Math.abs(a - b)).toBeLessThan(0.035);+ }+ }+});diff --git a/tests/color-mixer.test.ts b/tests/color-mixer.test.tsnew file mode 100644index 0000000..3900fe6--- /dev/null+++ b/tests/color-mixer.test.ts@@ -0,0 +1,84 @@+import { expect, test } from "bun:test";+import { getMockGPUDeviceInstrumentation, init, target } from "vgpu/mock";+import { createEditorRenderer } from "@/app/editor/renderer";+import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";+import { createDocument } from "@/lib/editor/document";+import { defaultAdjustments } from "@/lib/editor/scene";+import { imageFrame } from "@/lib/image-frame/geometry";+import { createImageSource } from "@/lib/image-source";+import { defaultCurve } from "@/lib/tone-curves/curve";++test("color edits validate, group, cancel and reset while renderers reuse and release their outputs", async () => {+ const gpu = await init();+ const image = target(gpu, { size: [32, 16], format: "rgba16float" });+ const source = createImageSource(image);+ const document = createDocument({+ source: "photo",+ frame: imageFrame(image.size),+ adjustments: defaultAdjustments,+ toneCurve: defaultCurve,+ });+ const renderer = createEditorRenderer(gpu, source);+ try {+ await renderer.update(document.scene.getState());+ const original = renderer.outputImage();+ setColorMixer(document, "blue", { hue: 0 });+ resetColorMixer(document);+ expect(document.history.status.getState().undoCount).toBe(0);+ document.history.begin();+ setColorMixer(document, "blue", { hue: 10 });+ setColorMixer(document, "blue", { hue: 25, saturation: -20 });+ document.history.commit();+ expect(document.history.status.getState().undoCount).toBe(1);+ const scene = document.scene.getState();+ expect(scene.colorMixer?.hue[5]).toBe(25);+ expect(scene.colorMixer?.saturation[5]).toBe(-20);+ await renderer.update(scene);+ const edited = renderer.outputImage();+ expect(edited).not.toBe(original);+ expect(edited.format).toBe("rgba16float");+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;+ const pipelines = calls.createRenderPipeline;+ setColorMixer(document, "blue", { hue: 25 });+ expect(document.history.status.getState().undoCount).toBe(1);+ document.history.begin();+ setColorMixer(document, "red", { luminance: 100 });+ document.history.cancel();+ expect(document.scene.getState()).toEqual(scene);+ document.history.undo();+ await renderer.update(document.scene.getState());+ expect(renderer.outputImage()).toBe(original);+ document.history.redo();+ await renderer.update(document.scene.getState());+ expect(renderer.outputImage()).toBe(edited);+ expect(calls.createRenderPipeline).toBe(pipelines);+ for (const value of [NaN, Infinity, -101, 101]) {+ expect(() => setColorMixer(document, "red", { hue: value })).toThrow(+ "Invalid",+ );+ }+ expect(() =>+ Reflect.apply(setColorMixer, undefined, [document, "pink", { hue: 2 }]),+ ).toThrow("Invalid");+ expect(() =>+ Reflect.apply(setColorMixer, undefined, [+ document,+ "red",+ { contrast: 2 },+ ]),+ ).toThrow("Invalid");+ expect(document.scene.getState()).toEqual(scene);+ resetColorMixer(document);+ expect(document.scene.getState().colorMixer).toBeUndefined();+ document.history.undo();+ expect(document.scene.getState()).toEqual(scene);+ renderer.dispose();+ expect(() => edited.color.view).toThrow("destroyed");+ expect(() => image.color.view).not.toThrow();+ } finally {+ renderer.dispose();+ document.dispose();+ source.dispose();+ gpu.dispose();+ }+});diff --git a/tests/editing.e2e.ts b/tests/editing.e2e.tsindex ab95dce..55ab96d 100644--- a/tests/editing.e2e.ts+++ b/tests/editing.e2e.ts@@ -1,15 +1,11 @@import { readFile } from "node:fs/promises";-import type { Locator, Page } from "@playwright/test";+import type { Page } from "@playwright/test";import { type ImageFrame, imageFrame } from "@/lib/image-frame/geometry";import { interpolatePchip } from "@/lib/math";+import { colorMixerEditing } from "./color-mixer-editing";import { expect, test } from "./fixtures";import { readImage, readPixel, readPreview } from "./images";--async function box(locator: Locator) {- const bounds = await locator.boundingBox();- if (!bounds) throw new Error(`Missing bounds for ${locator}`);- return bounds;-}+import { box, drag } from "./pointer";function expectCentered(actual: { x: number; y: number; width: number; height: number },@@ -25,13 +21,6 @@ function expectCentered();}-async function drag(page: Page, from: number[], to: number[], steps = 8) {- await page.mouse.move(from[0], from[1]);- await page.mouse.down();- await page.mouse.move(to[0], to[1], { steps });- await page.mouse.up();-}-async function zoom(page: Page, factor: number) {await page.keyboard.down("Control");await page.mouse.wheel(0, -Math.log(factor) * 100);@@ -317,6 +306,8 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportawait expect.poll(() => canvas.screenshot()).toEqual(original);});+ await colorMixerEditing(page);+await test.step("clarity changes local contrast and histogram, then undoes and resets", async () => {const field = page.getByRole("textbox", { name: "Clarity", exact: true });const slider = page.getByRole("slider", { name: "Clarity", exact: true });diff --git a/tests/gpu.html b/tests/gpu.htmlnew file mode 100644index 0000000..802cfc6--- /dev/null+++ b/tests/gpu.html@@ -0,0 +1,9 @@+<!doctype html>+<html lang="en">+ <head>+ <meta charset="utf-8" />+ <link rel="icon" href="data:," />+ <title>GPU tests</title>+ </head>+ <body></body>+</html>diff --git a/tests/pointer.ts b/tests/pointer.tsnew file mode 100644index 0000000..ce46d31--- /dev/null+++ b/tests/pointer.ts@@ -0,0 +1,21 @@+import type { Locator, Page } from "@playwright/test";++export async function box(locator: Locator) {+ const bounds = await locator.boundingBox();+ if (!bounds) {+ throw new Error(`Missing bounds for ${locator}`);+ }+ return bounds;+}++export async function drag(+ page: Page,+ from: number[],+ to: number[],+ steps = 8,+) {+ await page.mouse.move(from[0], from[1]);+ await page.mouse.down();+ await page.mouse.move(to[0], to[1], { steps });+ await page.mouse.up();+}diff --git a/tests/rendering-benchmark.ts b/tests/rendering-benchmark.tsnew file mode 100644index 0000000..b733de2--- /dev/null+++ b/tests/rendering-benchmark.ts@@ -0,0 +1,178 @@+import { effect, type Frame, frame, init, target, timer } from "vgpu";+import { encodeImage } from "@/app/editor/export/export-image";+import { createRenderer } from "@/lib/editor/renderer";+import { defaultAdjustments, type Scene } from "@/lib/editor/scene";+import { imageFrame } from "@/lib/image-frame/geometry";+import { createImageSource } from "@/lib/image-source";+import { defaultCurve } from "@/lib/tone-curves/curve";++export type Workload = "baseline" | "neutral" | "active";++function summarize(values: number[]) {+ const sorted = values.toSorted((a, b) => a - b);+ return {+ samples: values,+ median:+ (sorted[Math.floor((sorted.length - 1) / 2)] ++ sorted[Math.ceil((sorted.length - 1) / 2)]) /+ 2,+ p95: sorted[Math.ceil(sorted.length * 0.95) - 1],+ };+}++/** Runs the production passes offscreen; React, display, and export encoding are outside timings. */+export async function benchmarkRendering(+ workload: Workload,+ size: [number, number],+ warmup: number,+ samples: number,+) {+ const adapter = await navigator.gpu.requestAdapter();+ if (!adapter) {+ throw new Error(+ "No WebGPU adapter. Use the project's Playwright configuration.",+ );+ }+ const timestamps = adapter.features.has("timestamp-query");+ const gpu = await init({+ requiredFeatures: timestamps ? ["timestamp-query"] : [],+ });+ const errors: Error[] = [];+ gpu.onError((error) => errors.push(error));+ const input = target(gpu, { size, format: "rgba16float" });+ const source = createImageSource(input);+ const clock = timestamps ? timer(gpu) : undefined;+ let passMs: number | undefined;+ clock?.onResults((spans) => {+ passMs = spans["color-mixer"];+ });+ const scene: Scene = {+ source: "benchmark",+ frame: imageFrame(size),+ adjustments: { ...defaultAdjustments, exposure: 0.25, contrast: 10 },+ toneCurve: defaultCurve,+ colorMixer:+ workload === "active"+ ? {+ hue: new Array<number>(8).fill(20),+ saturation: new Array<number>(8).fill(25),+ luminance: new Array<number>(8).fill(10),+ }+ : undefined,+ };+ // The baseline also runs against revisions predating the mixer.+ const path = "/src/features/color-mixer/pass.ts";+ const createMixer =+ workload === "baseline"+ ? undefined+ : (+ (await import(+ /* @vite-ignore */ path+ )) as typeof import("@/features/color-mixer/pass")+ ).createColorMixer;+ const setupStart = performance.now();+ const renderer = createRenderer(gpu, source, createMixer);+ const rendererSetupMs = performance.now() - setupStart;+ const mixer = createMixer?.(gpu, input);+ async function measure(render: () => void | Promise<void>, timed: boolean) {+ const encoding: number[] = [];+ const completed: number[] = [];+ const durations: number[] = [];+ for (let i = 0; i < warmup + samples; i++) {+ passMs = undefined;+ const start = performance.now();+ await render();+ const encoded = performance.now();+ await gpu.gpu.queue.onSubmittedWorkDone();+ const end = performance.now();+ await gpu.settled();+ if (errors.length) {+ throw errors[0];+ }+ if (i >= warmup) {+ encoding.push(encoded - start);+ completed.push(end - start);+ if (passMs !== undefined) {+ durations.push(passMs);+ }+ }+ }+ return {+ cpuEncodeMs: summarize(encoding),+ completedMs: summarize(completed),+ gpuMs: timed && durations.length ? summarize(durations) : null,+ missingGpuSamples:+ timed && timestamps ? samples - durations.length : null,+ };+ }+ try {+ // A deterministic linear Rec.2020 gradient spans saturated colors, neutrals, and HDR.+ const fill = effect(+ gpu,+ `+ @fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {+ let uv = p.xy / vec2f(${size[0]}.0, ${size[1]}.0);+ let rgb = 0.5 + 0.5 * cos(uv.x * 6.2831853 + vec3f(0.0, -2.0943951, 2.0943951));+ return vec4f(mix(vec3f(0.18), rgb * 2.0, uv.y), 1.0);+ }`,+ );+ frame(gpu, (f) => f.pass(input, fill));+ await gpu.gpu.queue.onSubmittedWorkDone();+ const start = performance.now();+ await renderer.update(scene);+ await gpu.gpu.queue.onSubmittedWorkDone();+ await gpu.settled();+ const firstRenderMs = performance.now() - start;+ const rendering = await measure(() => renderer.update(scene), false);+ const renderMixer = (f: Frame) => {+ // Instrument this owned frame only; execute the feature's actual pass unchanged.+ const pass = f.pass.bind(f);+ f.pass = (options, body) =>+ pass(+ {+ ...("target" in options ? options : { target: options }),+ timer: clock?.span("color-mixer"),+ },+ body,+ );+ mixer?.render(f, input, scene);+ };+ const isolated = mixer+ ? await measure(() => {+ frame(gpu, renderMixer);+ }, workload === "active")+ : null;+ const pixels = await renderer.outputImage().readFloats();+ if (!pixels.every(Number.isFinite)) {+ throw new Error("Benchmark output contains non-finite pixels.");+ }+ const blob = await encodeImage(gpu, renderer.outputImage(), {+ longEdge: 960,+ });+ return {+ workload,+ size,+ warmup,+ samples,+ timestamps,+ adapter: {+ vendor: adapter.info.vendor,+ architecture: adapter.info.architecture,+ device: adapter.info.device,+ description: adapter.info.description,+ },+ rendererSetupMs,+ firstRenderMs,+ rendering,+ isolated,+ outputBytes: workload === "active" ? size[0] * size[1] * 8 : 0,+ image: [...new Uint8Array(await blob.arrayBuffer())],+ };+ } finally {+ mixer?.dispose();+ renderer.dispose();+ source.dispose();+ clock?.dispose();+ gpu.dispose();+ }+}diff --git a/tests/rendering.bench.ts b/tests/rendering.bench.tsnew file mode 100644index 0000000..0eb3213--- /dev/null+++ b/tests/rendering.bench.ts@@ -0,0 +1,56 @@+import { execFileSync } from "node:child_process";+import { writeFile } from "node:fs/promises";+import { cpus, release } from "node:os";+import { expect, test } from "./fixtures";+import type { Workload } from "./rendering-benchmark";++for (const workload of ["baseline", "neutral", "active"] as const) {+ test(`rendering ${workload}`, async ({ page, browser }, info) => {+ await page.goto("/tests/gpu.html");+ const result = await page.evaluate(async (workload: Workload) => {+ const path = "/tests/rendering-benchmark.ts";+ const { benchmarkRendering } = (await import(+ path+ )) as typeof import("./rendering-benchmark");+ return benchmarkRendering(workload, [2400, 1600], 8, 40);+ }, workload);+ const { image, ...timings } = result;+ const report = {+ revision: execFileSync("git", ["rev-parse", "HEAD"], {+ encoding: "utf8",+ }).trim(),+ workingTreeChanged:+ execFileSync("git", ["status", "--porcelain"], {+ encoding: "utf8",+ }).trim().length > 0,+ browser: browser.version(),+ platform: process.platform,+ kernel: release(),+ cpu: cpus()[0]?.model,+ logicalCpus: cpus().length,+ flags: info.project.use.launchOptions?.args,+ ...timings,+ };+ expect(report.rendering.completedMs.samples).toHaveLength(report.samples);+ if (workload === "active" && report.timestamps) {+ expect(report.isolated?.missingGpuSamples).toBe(0);+ }+ await writeFile(+ info.outputPath("timings.json"),+ JSON.stringify(report, null, 2),+ );+ await writeFile(info.outputPath("render.png"), new Uint8Array(image));+ await info.attach("render", {+ path: info.outputPath("render.png"),+ contentType: "image/png",+ });+ console.log(+ JSON.stringify({+ workload,+ firstRenderMs: report.firstRenderMs,+ completedMs: report.rendering.completedMs.median,+ mixerGpuMs: report.isolated?.gpuMs?.median ?? null,+ }),+ );+ });+}