Make post_process_write() take a mutable reference, fixing ordering footgun

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/node.rs

@@ -16,7 +16,7 @@ use super::{CasPipeline, CasUniform};
 pub fn cas(
     view: ViewQuery<
         (
-            &ViewTarget,
+            &mut ViewTarget,
             &ViewCasPipeline,
             &DynamicUniformIndex<CasUniform>,
         ),
@@ -28,7 +28,7 @@ pub fn cas(
     mut ctx: RenderContext,
     mut cached_bind_group: Local<Option<(BufferId, TextureViewId, BindGroup)>>,
 ) {
-    let (target, pipeline, uniform_index) = view.into_inner();
+    let (mut target, pipeline, uniform_index) = view.into_inner();
 
     let uniforms_id = uniforms.buffer().unwrap().id();
     let Some(uniforms_binding) = uniforms.binding() else {

crates/bevy_anti_alias/src/dlss/node.rs

@@ -24,14 +24,20 @@ pub fn dlss_super_resolution(
         &DlssRenderContext<DlssSuperResolutionFeature>,
         &MainPassResolutionOverride,
         &TemporalJitter,
-        &ViewTarget,
+        &mut ViewTarget,
         &ViewPrepassTextures,
     )>,
     adapter: Res<RenderAdapter>,
     mut ctx: RenderContext,
 ) {
-    let (dlss, dlss_context, resolution_override, temporal_jitter, view_target, prepass_textures) =
-        view.into_inner();
+    let (
+        dlss,
+        dlss_context,
+        resolution_override,
+        temporal_jitter,
+        mut view_target,
+        prepass_textures,
+    ) = view.into_inner();
 
     let (Some(prepass_depth_texture), Some(prepass_motion_vectors_texture)) =
         (&prepass_textures.depth, &prepass_textures.motion_vectors)
@@ -74,7 +80,7 @@ pub fn dlss_ray_reconstruction(
         &DlssRenderContext<DlssRayReconstructionFeature>,
         &MainPassResolutionOverride,
         &TemporalJitter,
-        &ViewTarget,
+        &mut ViewTarget,
         &ViewPrepassTextures,
         &ViewDlssRayReconstructionTextures,
     )>,
@@ -86,7 +92,7 @@ pub fn dlss_ray_reconstruction(
         dlss_context,
         resolution_override,
         temporal_jitter,
-        view_target,
+        mut view_target,
         prepass_textures,
         ray_reconstruction_textures,
     ) = view.into_inner();

crates/bevy_anti_alias/src/fxaa/mod.rs

@@ -102,11 +102,17 @@ impl Plugin for FxaaPlugin {
             )
             .add_systems(
                 Core3d,
-                fxaa.after(tonemapping).in_set(Core3dSystems::PostProcess),
+                fxaa.after(tonemapping)
+                    .in_set(Core3dSystems::PostProcess)
+                    .in_set(crate::AntiAliasingSystems)
+                    .ambiguous_with(crate::AntiAliasingSystems),
             )
             .add_systems(
                 Core2d,
-                fxaa.after(tonemapping).in_set(Core2dSystems::PostProcess),
+                fxaa.after(tonemapping)
+                    .in_set(Core2dSystems::PostProcess)
+                    .in_set(crate::AntiAliasingSystems)
+                    .ambiguous_with(crate::AntiAliasingSystems),
             );
     }
 }

crates/bevy_anti_alias/src/fxaa/node.rs

@@ -11,13 +11,13 @@ use bevy_render::{
 };
 
 pub fn fxaa(
-    view: ViewQuery<(&ViewTarget, &CameraFxaaPipeline, &Fxaa)>,
+    view: ViewQuery<(&mut ViewTarget, &CameraFxaaPipeline, &Fxaa)>,
     fxaa_pipeline: Res<FxaaPipeline>,
     pipeline_cache: Res<PipelineCache>,
     mut ctx: RenderContext,
     mut cached_bind_group: Local<Option<(TextureViewId, BindGroup)>>,
 ) {
-    let (target, pipeline, fxaa) = view.into_inner();
+    let (mut target, pipeline, fxaa) = view.into_inner();
 
     if !fxaa.enabled {
         return;

crates/bevy_anti_alias/src/lib.rs

@@ -6,6 +6,7 @@
 )]
 
 use bevy_app::Plugin;
+use bevy_ecs::schedule::SystemSet;
 use contrast_adaptive_sharpening::CasPlugin;
 use fxaa::FxaaPlugin;
 use smaa::SmaaPlugin;
@@ -18,6 +19,17 @@ pub mod fxaa;
 pub mod smaa;
 pub mod taa;
 
+/// A [`SystemSet`] for Anti-aliasing technique systems.
+///
+/// Nothing prevents a camera from enabling more than one of these, but in practice
+/// only one is usually active, and the ordering between them is not meaningful.
+///
+/// Members should declare `.ambiguous_with(AntiAliasingSystems)` to suppress the
+/// ambiguity report. These systems take `&mut ViewTarget` and so are never run
+/// concurrently.
+#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
+pub struct AntiAliasingSystems;
+
 /// Adds fxaa, smaa, taa, contrast aware sharpening, and optional dlss support.
 #[derive(Default)]
 pub struct AntiAliasPlugin;

crates/bevy_anti_alias/src/smaa/mod.rs

@@ -376,11 +376,17 @@ impl Plugin for SmaaPlugin {
             )
             .add_systems(
                 Core3d,
-                smaa.after(tonemapping).in_set(Core3dSystems::PostProcess),
+                smaa.after(tonemapping)
+                    .in_set(Core3dSystems::PostProcess)
+                    .in_set(crate::AntiAliasingSystems)
+                    .ambiguous_with(crate::AntiAliasingSystems),
             )
             .add_systems(
                 Core2d,
-                smaa.after(tonemapping).in_set(Core2dSystems::PostProcess),
+                smaa.after(tonemapping)
+                    .in_set(Core2dSystems::PostProcess)
+                    .in_set(crate::AntiAliasingSystems)
+                    .ambiguous_with(crate::AntiAliasingSystems),
             );
     }
 }
@@ -834,7 +840,7 @@ impl SmaaPreset {
 
 pub fn smaa(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &ViewSmaaPipelines,
         &SmaaInfoUniformOffset,
         &SmaaTextures,
@@ -846,7 +852,7 @@ pub fn smaa(
     mut ctx: RenderContext,
 ) {
     let (
-        view_target,
+        mut view_target,
         view_pipelines,
         view_smaa_uniform_offset,
         smaa_textures,

crates/bevy_anti_alias/src/taa/mod.rs

@@ -69,7 +69,10 @@ impl Plugin for TemporalAntiAliasPlugin {
 
         render_app.add_systems(
             Core3d,
-            temporal_anti_alias.in_set(Core3dSystems::EarlyPostProcess),
+            temporal_anti_alias
+                .in_set(Core3dSystems::EarlyPostProcess)
+                .in_set(crate::AntiAliasingSystems)
+                .ambiguous_with(crate::AntiAliasingSystems),
         );
     }
 }
@@ -136,7 +139,7 @@ impl SyncComponent<RenderApp> for TemporalAntiAliasing {
 pub fn temporal_anti_alias(
     view: ViewQuery<(
         &ExtractedCamera,
-        &ViewTarget,
+        &mut ViewTarget,
         &TemporalAntiAliasHistoryTextures,
         &ViewPrepassTextures,
         &TemporalAntiAliasPipelineId,
@@ -146,7 +149,7 @@ pub fn temporal_anti_alias(
     pipeline_cache: Res<PipelineCache>,
     mut ctx: RenderContext,
 ) {
-    let (camera, view_target, taa_history_textures, prepass_textures, taa_pipeline_id, msaa) =
+    let (camera, mut view_target, taa_history_textures, prepass_textures, taa_pipeline_id, msaa) =
         view.into_inner();
 
     if *msaa != Msaa::Off {

crates/bevy_core_pipeline/src/fullscreen_material.rs

@@ -234,7 +234,7 @@ fn prepare_bind_groups<T: FullscreenMaterial>(
     mut commands: Commands,
     mut view: Query<(
         Entity,
-        &ViewTarget,
+        &mut ViewTarget,
         Option<&mut FullscreenMaterialBindGroup<T>>,
         Option<&T>,
     )>,
@@ -274,12 +274,12 @@ fn prepare_bind_groups<T: FullscreenMaterial>(
         });
 
         if let Some(bind_groups) = &mut maybe_bind_groups {
-            if bind_groups.cache.should_update(view_target) {
-                bind_groups.cache.update(view_target, builder);
+            if bind_groups.cache.should_update(&view_target) {
+                bind_groups.cache.update(&view_target, builder);
             }
         } else {
             commands.entity(entity).insert(FullscreenMaterialBindGroup {
-                cache: builder.generate_bind_groups(view_target),
+                cache: builder.generate_bind_groups(&view_target),
                 _marker: PhantomData::<T>,
             });
         }
@@ -288,15 +288,15 @@ fn prepare_bind_groups<T: FullscreenMaterial>(
 
 pub fn fullscreen_material_system<T: FullscreenMaterial>(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &DynamicUniformIndex<T>,
         &FullscreenMaterialBindGroup<T>,
         &FullscreenMaterialPipelineId,
     )>,
     pipeline_cache: Res<PipelineCache>,
     mut ctx: RenderContext,
 ) {
-    let (view_target, settings_index, bind_groups, pipeline_id) = view.into_inner();
+    let (mut view_target, settings_index, bind_groups, pipeline_id) = view.into_inner();
 
     let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline_id.0) else {
         return;

crates/bevy_core_pipeline/src/tonemapping/node.rs

@@ -27,7 +27,7 @@ pub fn tonemapping(
     view: ViewQuery<(
         &ExtractedCamera,
         &ViewUniformOffset,
-        &ViewTarget,
+        &mut ViewTarget,
         &ViewTonemappingPipeline,
         &Tonemapping,
     )>,
@@ -40,7 +40,7 @@ pub fn tonemapping(
     mut cache: Local<TonemappingBindGroupCache>,
     mut ctx: RenderContext,
 ) {
-    let (camera, view_uniform_offset, target, view_tonemapping_pipeline, tonemapping) =
+    let (camera, view_uniform_offset, mut target, view_tonemapping_pipeline, tonemapping) =
         view.into_inner();
 
     if *tonemapping == Tonemapping::None {

crates/bevy_dev_tools/src/render_debug.rs

@@ -629,7 +629,7 @@ fn prepare_debug_overlay_resources(
 
 fn render_debug_overlay(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &RenderDebugOverlay,
         &RenderDebugOverlayPipelineId,
         &RenderDebugOverlayUniformOffset,
@@ -642,7 +642,7 @@ fn render_debug_overlay(
     fallback_image: Res<FallbackImage>,
     mut ctx: RenderContext,
 ) {
-    let (target, config, pipeline_id, uniform_offset, mesh_view_bind_group, depth_pyramid) =
+    let (mut target, config, pipeline_id, uniform_offset, mesh_view_bind_group, depth_pyramid) =
         view.into_inner();
 
     if !config.enabled {

crates/bevy_pbr/src/lib.rs

@@ -413,19 +413,21 @@ impl Plugin for PbrPlugin {
                 per_view_shadow_pass::<EARLY_SHADOW_PASS>
                     .after(early_prepass_build_indirect_parameters)
                     .before(early_downsample_depth)
-                    .before(per_view_shadow_pass::<LATE_SHADOW_PASS>),
+                    .before(per_view_shadow_pass::<LATE_SHADOW_PASS>)
+                    .in_set(Core3dSystems::Prepass),
                 per_view_shadow_pass::<LATE_SHADOW_PASS>
                     .after(late_prepass_build_indirect_parameters)
                     .before(main_build_indirect_parameters)
-                    .before(Core3dSystems::MainPass),
+                    .in_set(Core3dSystems::Prepass),
                 shared_shadow_pass::<EARLY_SHADOW_PASS>
                     .after(early_prepass_build_indirect_parameters)
                     .before(early_downsample_depth)
-                    .before(shared_shadow_pass::<LATE_SHADOW_PASS>),
+                    .before(shared_shadow_pass::<LATE_SHADOW_PASS>)
+                    .in_set(Core3dSystems::Prepass),
                 shared_shadow_pass::<LATE_SHADOW_PASS>
                     .after(late_prepass_build_indirect_parameters)
                     .before(main_build_indirect_parameters)
-                    .before(Core3dSystems::MainPass),
+                    .in_set(Core3dSystems::Prepass),
             ),
         );
     }

crates/bevy_pbr/src/ssr/mod.rs

@@ -244,7 +244,7 @@ impl Default for ScreenSpaceReflections {
 
 pub fn screen_space_reflections(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &MeshViewBindGroup,
         &ScreenSpaceReflectionsPipelineId,
     )>,
@@ -254,7 +254,7 @@ pub fn screen_space_reflections(
     render_images: Res<RenderAssets<GpuImage>>,
     mut ctx: RenderContext,
 ) {
-    let (view_target, view_bind_group, ssr_pipeline_id) = view.into_inner();
+    let (mut view_target, view_bind_group, ssr_pipeline_id) = view.into_inner();
 
     // Grab the render pipeline.
     let Some(render_pipeline) = pipeline_cache.get_render_pipeline(**ssr_pipeline_id) else {

crates/bevy_post_process/src/dof/mod.rs

@@ -763,7 +763,7 @@ impl DepthOfFieldPipelines {
 pub(crate) fn depth_of_field(
     view: ViewQuery<(
         &ViewUniformOffset,
-        &ViewTarget,
+        &mut ViewTarget,
         &ViewDepthStencilTexture,
         &DepthOfFieldPipelines,
         &ViewDepthOfFieldBindGroupLayouts,
@@ -777,7 +777,7 @@ pub(crate) fn depth_of_field(
 ) {
     let (
         view_uniform_offset,
-        view_target,
+        mut view_target,
         view_depth_texture,
         view_pipelines,
         view_bind_group_layouts,

crates/bevy_post_process/src/effect_stack/mod.rs

@@ -242,7 +242,7 @@ impl SpecializedRenderPipeline for PostProcessingPipeline {
 
 pub(crate) fn post_processing(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &PostProcessingPipelineId,
         AnyOf<(&ChromaticAberration, &Vignette, &LensDistortion)>,
         &PostProcessingUniformBufferOffsets,
@@ -254,7 +254,7 @@ pub(crate) fn post_processing(
     default_lut: Res<DefaultChromaticAberrationLut>,
     mut ctx: RenderContext,
 ) {
-    let (view_target, pipeline_id, post_effects, post_processing_uniform_buffer_offsets) =
+    let (mut view_target, pipeline_id, post_effects, post_processing_uniform_buffer_offsets) =
         view.into_inner();
 
     let (maybe_chromatic_aberration, maybe_vignette, maybe_lens_distortion) = post_effects;

crates/bevy_post_process/src/motion_blur/mod.rs

@@ -183,7 +183,7 @@ impl Plugin for MotionBlurPlugin {
 
 pub fn motion_blur(
     view: ViewQuery<(
-        &ViewTarget,
+        &mut ViewTarget,
         &MotionBlurPipelineId,
         &ViewPrepassTextures,
         &ViewDepthStencilTexture,
@@ -196,7 +196,7 @@ pub fn motion_blur(
     globals_buffer: Res<GlobalsBuffer>,
     mut ctx: RenderContext,
 ) {
-    let (view_target, pipeline_id, prepass_textures, depth, motion_blur_uniform, msaa) =
+    let (mut view_target, pipeline_id, prepass_textures, depth, motion_blur_uniform, msaa) =
         view.into_inner();
     let Some(depth_view) = depth.attachment.depth_stencil_views().depth_only_view() else {
         return;