Merge branch 'worktree-agent-afd449f5e7a01e341' into integration

# Conflicts:
#	core/dr-gpu/src/adjust.rs
#	core/dr-pipeline/ops/README.md
#	core/dr-pipeline/src/lib.rs
#	docs/traceability.md

core/dr-gpu/src/adjust.rs

@@ -34,6 +34,16 @@ use crate::{DemosaicedImage, GpuContext, GpuError};
 /// reads them.
 const RESERVED_FIELDS: usize = dr_pipeline::RESERVED_UNIFORM_FIELDS;
 
+/// TRACES: FR-DEV-3e
+/// The two crates must agree on how many points a base curve has.
+///
+/// `dr-decode` reads them from the profile database and `dr-pipeline` declares
+/// the uniform slots; this file is the only place the two meet, and it packs
+/// them by index. A disagreement would not fail to compile — it would upload a
+/// curve with a point missing or a stale float in it, which renders as a
+/// plausible-looking wrong tone response. Cheaper to catch here, at build time.
+const _: () = assert!(dr_decode::base_curve::POINTS == dr_pipeline::BASE_CURVE_POINTS);
+
 /// Runs composed operation chains against demosaiced images.
 pub struct AdjustPass {
     ctx: GpuContext,
@@ -677,6 +687,22 @@ impl AdjustPass {
         // runs. See `DemosaicedImage::is_non_linear`.
         let non_linear = if source.is_non_linear() { 1.0 } else { 0.0 };
         uniforms[12..16].copy_from_slice(&[wb[0], wb[1], wb[2], non_linear]);
+        // TRACES: FR-DEV-3e
+        // The camera profile's base curve, packed the way the generated block
+        // declares it: four x, four y, then the fifth point and the flag. The
+        // flag is what lets one compiled shader serve a profiled body and an
+        // unprofiled one, so the pipeline cache is not split in two by which
+        // camera took the frame.
+        //
+        // Written here rather than at the call site so that *both* callers —
+        // the plain render and the masked one — carry the profile. Filling it
+        // at one of them was how the two halves of this merge each had it.
+        let curve = source.base_curve();
+        let on = if curve.is_identity() { 0.0 } else { 1.0 };
+        let b = dr_pipeline::BASE_CURVE_UNIFORM_OFFSET;
+        uniforms[b..b + 4].copy_from_slice(&curve.xs[0..4]);
+        uniforms[b + 4..b + 8].copy_from_slice(&curve.ys[0..4]);
+        uniforms[b + 8..b + 12].copy_from_slice(&[curve.xs[4], curve.ys[4], on, 0.0]);
         uniforms
     }
 
@@ -862,7 +888,7 @@ pub(crate) fn numbered(src: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use dr_decode::{CfaPattern, CropRect, RawImage};
+    use dr_decode::{BaseCurve, CfaPattern, CropRect, RawImage};
     use dr_pipeline::ops::{colour_mixer, exposure, saturation};
     use dr_pipeline::EditGraph;
 
@@ -896,6 +922,7 @@ mod tests {
             // Identity, so the test reasons about the operations alone
             // rather than about a camera's colour response.
             color_matrix: Some([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]),
+            base_curve: BaseCurve::IDENTITY,
             crop: CropRect {
                 x: 0,
                 y: 0,
@@ -1069,6 +1096,7 @@ mod tests {
             white_level: 16383,
             wb_coeffs: [1.0, 1.0, 1.0, 1.0],
             color_matrix: Some([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]),
+            base_curve: BaseCurve::IDENTITY,
             crop: CropRect {
                 x: 0,
                 y: 0,
@@ -1491,6 +1519,7 @@ mod tests {
             white_level: 16383,
             wb_coeffs: [1.0, 1.0, 1.0, 1.0],
             color_matrix: Some([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]),
+            base_curve: BaseCurve::IDENTITY,
             crop: CropRect {
                 x: 0,
                 y: 0,
@@ -1590,6 +1619,7 @@ mod tests {
             white_level: 16383,
             wb_coeffs: [1.0, 1.0, 1.0, 1.0],
             color_matrix: Some([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]),
+            base_curve: BaseCurve::IDENTITY,
             crop: CropRect {
                 x: 0,
                 y: 0,