* wip(render): reconcile completed material and image pipeline source with 0.20 (#5493) Source-only integration reference for staged review, not a merge-ready aggregate. Donor: 0xlillith/solidcraft@aea20b0115. Upstream:858e5995d6. Retain original CPU/material contracts and explicit GPU donor provenance in docs/render-materials-lab.md (#2067, #2191, #2780, #3306). Preserve released format migrations and current navigation/startup/shell behavior. New saved records use pending descriptors. The physical-card descriptor follows the maintainer's material-engineering-cards naming request, with a legacy-lab format-29 regression. Replace raw new panel hosts with shared containers. Repository checks, complete workspace/all-target Clippy, and the independent physical/resource authoring checks pass for this source. The fresh full local CI invocation has reached test compilation and is not yet complete. Do not transfer donor native output or prior test totals to this integration. Generated review screenshots, video, package ZIP and machine logs remain at the immutable personal evidence pin. Uncommitted geometric displacement is backed up separately, not silently included. No kernel/vendor change, direct main write, release or independent contributor-branch rewrite. Co-authored-by: Christian Svensson <blue@cmd.nu> * test(cli): pin the Compact camera-sample admission diagnostic (#5493) The bounded request still refuses 1024x1024x64 samples before host initialization and writes no output. Update only the stale expected diagnostic to the existing Compact budget wording; production limits and code are unchanged. Exact-tree CLI regression suite: 14 passed, 0 failed. The full repository gate has been invoked separately and is not yet complete. * Normalize UI container violation paths across platforms Report repository-relative paths with forward slashes so diagnostics and the existing nested-package regression assertions agree on Windows and Unix. Keep the container detection rules unchanged. Validation: official ui-containers gate and all seven focused xtask tests passed; rustfmt and diff checks passed. Only xtask/dependencies were compiled; no application build or heavy tests. (cherry picked from commit44b58d8e10) * fix(render): preserve camera contracts and correct acceptance regressions (#5493) Preserve Design view.apply semantics with a separate strict Render camera command. Retain existing translations when English-only aliases collide; add material-axis entries and camera-specific pitch labels. Compare complete validated engineering cards and retain job handles before cancellation. Focused and native acceptance is pinned to treef8a423b21f. Full CI has been invoked separately and is not claimed green. Landing follows the render integration policy in #5493. * fix(render): resolve showcase licence and upstream resource hygiene (#5493) Record SychPL's explicit MIT OR Apache-2.0 grant, retaining source/model bytes and the Ubuntu lettering notice. Remove 80 absent attribution rows, personal fork records, dead delivery attributes and three fork/resource-only workflows. Existing xtask assets now performs bounded offline hash checks and rejects orphan render attribution; no parallel draft CI or package installation. Original authoring reproduction remains explicit. Scoped xtask tests, assets, Clippy, formatting and prepared SELENE validation pass; no application or renderer-wide result is inferred. * fix(render): align saved bounds and progressive sample resolution (#5493) Address review r4364211669/r4364211677/r4364211681/r4364211691/r4364211695. Persisted light/frame domains respect the existing 1e9 document bound; related LED/rectangle/direction cases use the same bound. Workstation primary resolve shares the 4096 admission cap and film counters use checked conversions. Exact candidate: 485 CPU render tests, 21 render document tests and strict scoped Clippy pass, including positive boundary round trips and 2048/4096 end-to-end checkpoints. No released format/migration edits, relaxed test limits or full-stack acceptance claim. * wip(render): isolate optional resources and harden sample handling (#5493) Review work in progress: opt-in encoded render library with reproducible runtime catalog exports; native-only robust dependency through the workspace; checked bloom slices; per-sample point-light diagnostics; independent area-light spatial/film keys. Resource-module binaries in both configurations, generation, Cargo production feature graphs and attribution checks pass. Full engine/render regression and combined acceptance are pending: do not merge this donor as a constituent or treat scoped resource proof as runtime acceptance. * fix(gpu): preserve donor allocations through the scope-safety repair (#5722) Port the native-validated #5723 scope-cleanup correction into the experimental donor, retaining its adaptive, volume, aging, photographic and bloom allocations. Same reverse-drain helper and regression cases; the donor combination still needs its own compile/test gate and is not covered retroactively by render-base results. * claim: #1369 * Reject unknown pending concepts after format folding (#1369) * test(render): close bounded sampling and bloom review regressions (#5493) Validate the optional-resource/lighting/dependency donor at its exact tree. Required Vulkan GPU 127/0/3; CPU renderer 487/0; engine Render 72/0; document render 21/0; lean library 7/0; strict scoped Clippy, assets/layers/lists/containers and lean-engine WASM pass. Preserve original failed controller/typing attempts. This is the draft donor/disposition source, not a replacement for constituent render PRs or final main acceptance. * wip(render): preserve stable aging target validation candidate Exact staged source from prior review work on donor3b892eab5e. This is a recovery/review checkpoint, NOT accepted delivery. An actual command-path regression currently fails because the selected executor refuses ordered surface aging. No assertion, capability or admission limit is weakened. Native/UI/full combination acceptance remains pending. Saved/runtime split adds one pending descriptor and retains original file scope; no main/render branch is changed. * test(render): preserve numeric setup intent at the admitted coordinate bound Follow up jyviko review on #5494 without weakening the corrected saved-coordinate contract. The positive clicked fixture uses 1e9 instead of inadmissible 2e9; explicit out-of-range cases still refuse, and the full saved setup round-trips through JSON and the native container. Exact-source Render workspace 95/0 and strict all-target UI Clippy pass. This does not incorporate the separately failing stable-aging candidate or claim full current-render acceptance. * test(render): use the real GPU executor for saved aging Move successful native cold-reopen Check/Start coverage from the CPU-backed protocol fixture into the production GPU executor tests. Verify capture-index changes preserve the stable target and that enabling aging changes both PNG and raw EXR output. Retain explicit, allocation-free refusal coverage for executors without aging support. Production capabilities and admission checks are unchanged. * fix(render): persist stable identities for targeted aging (#5493) Separate saved RenderBodyTarget identities from captured mesh ordinals. Reject legacy ambiguous targets, resolve Check/Start after visibility changes and preserve native reopening, copies and undo. Unsupported executors still refuse; real AMD Vulkan regression completes saved aging after reordered capture. Source tree6b84c8adpasses document 23, engine Render 75, GPU effects 5 and Render UI 95 with no failures; scoped strict Clippy, WASM and repository gates pass. Fresh CLI/native reopen and clean/aged GPU exports pass with identical physical totals and inspected actual images. Whole current-render integration is separate. * fix(render): reconcile combined CPU/GPU contracts on current upstream Unify captured resources/status and CPU-vs-GPU request schemas after the real two-parent integration; remove obsolete duplicate Vulkan selector and retain combined platform-filter regression. Deduplicate only identical or superseded test definitions, retaining the stronger card metadata and reserved-executor assertions. No assertions, admission limits or feature refusals are weakened. All targets of render dependencies, GPU, engine, UI, CLI and native app pass cargo check with raytrace-cpu and bundled-render-library at treec70d00d1. Native executable tests and full current-source acceptance remain pending. This is a private integration rehearsal for subsequent constituent PRs, not an aggregate official render/main merge. * test(render): retain one complete host lifetime regression set Deduplicate byte-identical DropProbe/task-lifetime tests and retain the adapted environment/texture ownership regressions with every assertion and complete memory estimate. Keep the registered-geometry admission regression once; only struct field order differed. Replace a one-element diagnostic loop with its equivalent block, preserving all wrap/width assertions. Test-only integration repair. Formatting and diff checks pass; refreshed executable validation is required. No production behavior, limits, assertions or ignores changed. * fix(doc): recognize the proven format-29 card descriptor alias Normalize only the historical format-29 physical-material-cards spelling, and only when material-engineering-cards is registered. Admission and migration de-duplication use the same identity. Unknown concepts, wrong versions and incapable readers still refuse before mutation. Six controlled-history Rust regressions and actual CLI migration/no-clobber acceptance pass. No version, released migration or CI changes. Refs #5793, #1369, #5493. * test(render): preserve grounding refusal before explicit instance moves Update the two Render binding fixtures for upstream first-occurrence grounding. Verify grounded movement refuses without changing document/history, then explicitly unground through the public command before the intended move. Retain every target, resource, copy and persistence assertion. Refs #5493. --------- Co-authored-by: Christian Svensson <blue@cmd.nu> Co-authored-by: Victor Santos Oliveira <56417388+Vittuu@users.noreply.github.com> Co-authored-by: cfaulkingham <colin.faulkingham@gmail.com>
7.9 KiB
Saved HDR resources
A named CPU or GPU render setup can carry its Radiance HDR environment inside the design. Saving works without an image host or physical GPU. The saved design is self-contained in both JSON and the design container: reopening or rendering does not need the original HDR file, a working directory or a temporary extracted file.
This adds resource persistence to the existing numerical job contract. It does not add a new renderer, colour conversion, texture format, material assignment or durable body/face identity.
Inspect, capture, then reuse
render.hdr.inspect reads one bounded file through the caller's existing VFS scope
and validates its entire HDR stream. It returns only metadata:
{"sha256":"<64 lowercase hex digits>","width":2048,"height":1024,"encoded_bytes":1234567,"primaries":[0.64,0.33,0.30,0.60,0.15,0.06,0.3127,0.3290]}
primaries is null when the source does not declare them. Inspect does not change
the document, geometry, revision, dirty state or undo history. Source bytes and
local paths are absent from the reply.
render.settings.capture_hdr captures bytes and a complete setup edit atomically:
{
"name":"CPU HDR studio",
"set":{
"width":1600,"height":900,"exposure_ev":1.25,
"job":{"method":"cpu_raytrace","options":{"primary_samples":4,"lights":[],"shadows":true}}
},
"path":"studio.hdr",
"expected_sha256":"<digest returned by inspect>",
"rotation_rad":0.3,
"intensity":1,
"samples":16
}
The command takes the same top-level set patch as render.settings.set. Omission
preserves existing fields; a supplied job replaces the entire job. The resulting
job must be typed CPU/GPU, with hdr and environment absent/null. All numerical,
method, name and setup-count validation happens before reading the file. The
capture then verifies the optional expected digest, complete source, quotas and
method's colour policy before publishing anything. A changed file, denied path,
bad parameter, invalid source or exceeded quota leaves the document and history
unchanged. The picker workflow always supplies expected_sha256.
The reply is {name, setup, resource}, where resource is the metadata above.
One effective capture is one undo step; repeating identical bytes, controls and
setup is a no-op that preserves redo. A SHA-256 digest deduplicates the original
encoded bytes. Different rotation, intensity or colour-policy choices belong to
each setup, so several CPU/GPU setups can share one source.
After capture, edit the saved setup using render.settings.set; there is no file
read. An inline setup with an embedded reference resolves against its current
document's resources. Copying that setup alone into another document without the
resource fails clearly. A complete design carries both.
Saved controls and colour policy
| Method | Required options.hdr fields |
Bounds and interpretation |
|---|---|---|
| CPU raytrace | resource, rotation_rad, intensity, samples |
Rotation magnitude ≤1,000,000 radians; intensity 0..64; samples 1/4/16/64; source must declare exact sRGB/D65 primaries |
| GPU path | resource, rotation_rad, intensity, assume_linear_srgb |
Rotation magnitude ≤1,000,000 radians; intensity 0..100; declared primaries must match the existing GPU sRGB/D65 tolerance; an undeclared source requires explicit true |
Capture defaults to rotation 0, intensity 1, CPU samples 16 and GPU assumption false. The CPU command rejects the GPU-only assumption key, including false/null; GPU rejects the CPU-only samples key, including null. The saved HDR DTO requires all fields, making its intent explicit on reopen. Neither method accepts a source with other declared primaries. The flag records an interpretation, not a colour conversion. Original header exposure and channel corrections remain unchanged.
RenderSetup.exposure_ev remains the only saved exposure. CPU lowering copies it
into raytrace options and sets legacy outer EV to zero. GPU uses the common setup
EV. An HDR replaces the ambient term; directional, point, sun and area lights keep
their existing semantics, and the background remains a display backplate.
Storage, admission and reopening
Each resource is immutable and keyed by the SHA-256 of its encoded source. The
document retains at most 64 distinct resources and 64 MiB of encoded capacity;
each source is nonempty and at most 16 MiB, at most 2048×1024 pixels, 2:1 and the
existing standard -Y +X orientation. Headers, every scanline and finite corrected
radiance are checked before insertion. Invalid types, hashes and required
references fail; none is treated as an optional cache.
Plain JSON stores {kind:"radiance_hdr",data:"canonical base64"}. Before the
migration reader builds a JSON value tree, a borrowed RawValue probe limits the
resource count, detects duplicate keys and counts base64 characters, including
legal JSON escapes, against per-source and aggregate quotas. It does not allocate
an unescaped HDR string or decoded payload to measure them. The typed reader then
checks canonical padding, source content and digest. This is specific HDR payload
admission; it is not a new general allocation bound for all document JSON keys.
The container writes one required blobs/<sha256>.hdr entry per resource. Small
metadata contains kind, an empty data, and hdr_blob. A separate bounded raw
probe rejects duplicate references, inline payloads and oversized metadata strings
before constructing the value tree. Opening checks blob size before allocation,
the container hash and the resource key, then hydrates the strict JSON form before
normal document validation. Missing, corrupt, wrongly typed or oversized blobs
prevent opening the authoritative design. No entry is extracted to disk. Existing
archive, expanded-size and overall 256 MiB design-file limits remain in force.
The new pending descriptor is render-hdr-resources. Historical format numbers
and migration steps are unchanged. Old setups without resources or HDR references
retain their meaning; a build that lacks the new pending descriptor refuses the
newer design rather than discarding required content. No third-party image asset
or dependency is added; raw_value enables a feature of the existing serde_json.
Document clones, undo/redo and both CPU/GPU lowering share the immutable source buffer through Arc. Each job still charges its full encoded capacity and existing decode/table/worker budget. Sharing does not relax admission. Check and Start use the same preparation path and source digest, with no file IO for saved resources.
Existing runtime combinations
Transient body/face bindings remain available without pretending they are durable.
For a legacy request (settings.job absent/null), CPU environment accepts
{resource,rotation_radians,intensity,samples}. GPU accepts
{kind:"embedded_hdr",resource,rotation_rad,intensity,assume_linear_srgb}. These
references use the document's saved bytes; missing resources fail. CPU refuses
resource combined with path or expected_sha256. GPU's tagged object rejects
unknown fields. Existing file variants also accept expected_sha256, so an
inspected file changed before Check or Start is refused.
The format has no resource removal or garbage-collection command yet. Replacing a
setup retains old resources; the quota fails explicitly when exhausted. Saved
designs and autosave document snapshots remain independent of the original file.
A command-only crash journal before a checkpoint still needs the path recorded by
capture_hdr and, when supplied, its exact digest. It is not self-contained.
Regression sources cover offline save, no-op/undo/redo, file change, path scope, JSON and container reopen after deleting the source, CPU colour policy, strict hash/type/reference errors, escaped payload and count/byte limits, shared buffers, and Check/Start lowering. Native CPU coverage compares actual geometry lighting; the GPU protocol fixture checks admission and captured inputs without claiming physical GPU image validation.