Revert "Resolve one compositing space per camera stack (#25481)"

crates/bevy_camera/src/components.rs

@@ -100,11 +100,3 @@ pub enum CompositingSpace {
     /// Perceptually uniform blending. Often smoother gradients. Requires [`Hdr`] because its value can be outside [0, 1].
     Oklab,
 }
-
-impl CompositingSpace {
-    /// Whether this is the linear space, which needs no encode step.
-    #[inline]
-    pub fn is_linear(self) -> bool {
-        matches!(self, CompositingSpace::Linear)
-    }
-}

crates/bevy_core_pipeline/src/upscaling/mod.rs

@@ -3,10 +3,8 @@ use bevy_app::prelude::*;
 use bevy_camera::CameraOutputMode;
 use bevy_ecs::prelude::*;
 use bevy_render::{
-    camera::ExtractedCamera,
-    render_resource::*,
-    view::{ResolvedCompositingSpace, ViewTarget},
-    Render, RenderApp, RenderStartup, RenderSystems,
+    camera::ExtractedCamera, render_resource::*, view::ViewTarget, Render, RenderApp,
+    RenderStartup, RenderSystems,
 };
 
 mod node;
@@ -57,10 +55,9 @@ fn prepare_view_upscaling_pipelines(
         &ViewTarget,
         Option<&ExtractedCamera>,
         Option<&ViewUpscalingPipeline>,
-        Option<&ResolvedCompositingSpace>,
     )>,
 ) {
-    for (entity, view_target, camera, maybe_pipeline, resolved_space) in view_targets.iter() {
+    for (entity, view_target, camera, maybe_pipeline) in view_targets.iter() {
         let blend_state = if let Some(extracted_camera) = camera {
             match extracted_camera.output_mode {
                 CameraOutputMode::Skip => None,
@@ -93,7 +90,7 @@ fn prepare_view_upscaling_pipelines(
             target_format,
             blend_state,
             samples: 1,
-            source_space: ResolvedCompositingSpace::space(resolved_space),
+            source_space: view_target.compositing_space,
         };
 
         if maybe_pipeline.is_none_or(|ViewUpscalingPipeline(_, cached_key)| *cached_key != key) {

crates/bevy_render/src/camera.rs

@@ -12,8 +12,7 @@ use crate::{
     view::{
         ColorGrading, ExtractedView, ExtractedWindow, Msaa, NoIndirectDrawing,
         RenderExtractedVisibleEntities, RenderVisibleEntities, RenderVisibleEntitiesClass,
-        ResolvedCompositingSpace, RetainedViewEntity, ViewUniformOffset,
-        VisibilityExtractionSystemParam,
+        RetainedViewEntity, ViewUniformOffset, VisibilityExtractionSystemParam,
     },
     Extract, ExtractSchedule, Render, RenderApp, RenderSystems,
 };
@@ -468,6 +467,9 @@ pub struct ExtractedCamera {
     pub sorted_camera_index_for_target: usize,
     pub exposure: f32,
     pub hdr: bool,
+    /// When [`CompositingSpace::Srgb`], the main texture uses linear storage (`Rgba8Unorm`)
+    /// and shaders output sRGB-encoded values for gamma-encoded blending.
+    pub compositing_space: Option<CompositingSpace>,
 }
 
 pub fn extract_cameras(
@@ -513,7 +515,6 @@ pub fn extract_cameras(
         ExtractedCamera,
         ExtractedView,
         RenderVisibleEntities,
-        ResolvedCompositingSpace,
         TemporalJitter,
         MipBias,
         RenderLayers,
@@ -643,8 +644,8 @@ pub fn extract_cameras(
                         .map(Exposure::exposure)
                         .unwrap_or_else(|| Exposure::default().exposure()),
                     hdr,
+                    compositing_space: compositing_space.copied(),
                 },
-                ResolvedCompositingSpace(compositing_space.copied()),
                 ExtractedView {
                     retained_view_entity: RetainedViewEntity::new(main_entity.into(), None, 0),
                     clip_from_view: camera.clip_from_view(),
@@ -1195,6 +1196,7 @@ mod tests {
             sorted_camera_index_for_target: 0,
             exposure: 1.0,
             hdr,
+            compositing_space: None,
         }
     }