.

Author: tychedelia

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/mod.rs

@@ -4,8 +4,10 @@ use bevy_camera::Camera;
 use bevy_core_pipeline::{
     core_2d::graph::{Core2d, Node2d},
     core_3d::graph::{Core3d, Node3d},
+    schedule::{Core2dSchedule, Core2dSystems},
     FullscreenShader,
 };
+use crate::fxaa::fxaa;
 use bevy_ecs::{prelude::*, query::QueryItem};
 use bevy_image::BevyDefault as _;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
@@ -26,6 +28,7 @@ use bevy_utils::default;
 mod node;
 
 pub use node::CasNode;
+pub(crate) use node::cas;
 
 /// Applies a contrast adaptive sharpening (CAS) filter to the camera.
 ///
@@ -150,6 +153,11 @@ impl Plugin for CasPlugin {
                         Node2d::ContrastAdaptiveSharpening,
                         Node2d::EndMainPassPostProcessing,
                     ),
+                )
+                .add_systems(
+                    Core2dSchedule,
+                    cas.after(fxaa)
+                        .before(Core2dSystems::EndMainPassPostProcessing),
                 );
         }
     }

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/node.rs

@@ -10,7 +10,7 @@ use bevy_render::{
         BindGroup, BindGroupEntries, BufferId, Operations, PipelineCache,
         RenderPassColorAttachment, RenderPassDescriptor, TextureViewId,
     },
-    renderer::RenderContext,
+    renderer::{CurrentView, RenderContext, RenderContextParam},
     view::{ExtractedView, ViewTarget},
 };
 
@@ -124,3 +124,87 @@ impl Node for CasNode {
         Ok(())
     }
 }
+
+// =============================================================================
+// Schedule-based system (new approach)
+// =============================================================================
+
+/// Render system for Contrast Adaptive Sharpening.
+///
+/// This is the schedule-based replacement for [`CasNode`].
+pub(crate) fn cas(
+    view: CurrentView,
+    view_query: Query<
+        (
+            &ViewTarget,
+            &ViewCasPipeline,
+            &DynamicUniformIndex<CasUniform>,
+        ),
+        With<ExtractedView>,
+    >,
+    sharpening_pipeline: Res<CasPipeline>,
+    pipeline_cache: Res<PipelineCache>,
+    uniforms: Res<ComponentUniforms<CasUniform>>,
+    mut ctx: RenderContextParam,
+    mut cached_bind_group: Local<Option<(BufferId, TextureViewId, BindGroup)>>,
+) {
+    let view_entity = view.entity();
+
+    let Ok((target, pipeline, uniform_index)) = view_query.get(view_entity) else {
+        return;
+    };
+
+    let uniforms_id = uniforms.buffer().unwrap().id();
+    let Some(uniforms_binding) = uniforms.binding() else {
+        return;
+    };
+
+    let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline.0) else {
+        return;
+    };
+
+    let view_target = target.post_process_write();
+    let source = view_target.source;
+    let destination = view_target.destination;
+
+    let bind_group = match &mut *cached_bind_group {
+        Some((buffer_id, texture_id, bind_group))
+            if source.id() == *texture_id && uniforms_id == *buffer_id =>
+        {
+            bind_group
+        }
+        cached => {
+            let bind_group = ctx.render_device().create_bind_group(
+                "cas_bind_group",
+                &pipeline_cache.get_bind_group_layout(&sharpening_pipeline.texture_bind_group),
+                &BindGroupEntries::sequential((
+                    view_target.source,
+                    &sharpening_pipeline.sampler,
+                    uniforms_binding,
+                )),
+            );
+
+            let (_, _, bind_group) = cached.insert((uniforms_id, source.id(), bind_group));
+            bind_group
+        }
+    };
+
+    let pass_descriptor = RenderPassDescriptor {
+        label: Some("contrast_adaptive_sharpening"),
+        color_attachments: &[Some(RenderPassColorAttachment {
+            view: destination,
+            depth_slice: None,
+            resolve_target: None,
+            ops: Operations::default(),
+        })],
+        depth_stencil_attachment: None,
+        timestamp_writes: None,
+        occlusion_query_set: None,
+    };
+
+    let mut render_pass = ctx.command_encoder().begin_render_pass(&pass_descriptor);
+
+    render_pass.set_pipeline(pipeline);
+    render_pass.set_bind_group(0, bind_group, &[uniform_index.index()]);
+    render_pass.draw(0..3, 0..1);
+}

crates/bevy_anti_alias/src/fxaa/mod.rs

@@ -4,6 +4,8 @@ use bevy_camera::Camera;
 use bevy_core_pipeline::{
     core_2d::graph::{Core2d, Node2d},
     core_3d::graph::{Core3d, Node3d},
+    schedule::{Core2dSchedule, Core2dSystems},
+    tonemapping::tonemapping,
     FullscreenShader,
 };
 use bevy_ecs::prelude::*;
@@ -26,6 +28,7 @@ use bevy_utils::default;
 mod node;
 
 pub use node::FxaaNode;
+pub(crate) use node::fxaa;
 
 #[derive(Debug, Reflect, Eq, PartialEq, Hash, Clone, Copy)]
 #[reflect(PartialEq, Hash, Clone)]
@@ -117,6 +120,11 @@ impl Plugin for FxaaPlugin {
                     Node2d::Fxaa,
                     Node2d::EndMainPassPostProcessing,
                 ),
+            )
+            .add_systems(
+                Core2dSchedule,
+                fxaa.after(tonemapping)
+                    .before(Core2dSystems::EndMainPassPostProcessing),
             );
     }
 }

crates/bevy_anti_alias/src/fxaa/node.rs

@@ -9,7 +9,7 @@ use bevy_render::{
         BindGroup, BindGroupEntries, Operations, PipelineCache, RenderPassColorAttachment,
         RenderPassDescriptor, TextureViewId,
     },
-    renderer::RenderContext,
+    renderer::{CurrentView, RenderContext, RenderContextParam},
     view::ViewTarget,
 };
 
@@ -90,3 +90,69 @@ impl ViewNode for FxaaNode {
         Ok(())
     }
 }
+
+// =============================================================================
+// Schedule-based system (new approach)
+// =============================================================================
+
+/// Render system for FXAA anti-aliasing.
+///
+/// This is the schedule-based replacement for [`FxaaNode`].
+pub(crate) fn fxaa(
+    view: CurrentView,
+    view_query: Query<(&ViewTarget, &CameraFxaaPipeline, &Fxaa)>,
+    fxaa_pipeline: Res<FxaaPipeline>,
+    pipeline_cache: Res<PipelineCache>,
+    mut ctx: RenderContextParam,
+    mut cached_bind_group: Local<Option<(TextureViewId, BindGroup)>>,
+) {
+    let view_entity = view.entity();
+
+    let Ok((target, pipeline, fxaa)) = view_query.get(view_entity) else {
+        return;
+    };
+
+    if !fxaa.enabled {
+        return;
+    }
+
+    let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline.pipeline_id) else {
+        return;
+    };
+
+    let post_process = target.post_process_write();
+    let source = post_process.source;
+    let destination = post_process.destination;
+    let bind_group = match &mut *cached_bind_group {
+        Some((id, bind_group)) if source.id() == *id => bind_group,
+        cached => {
+            let bind_group = ctx.render_device().create_bind_group(
+                None,
+                &pipeline_cache.get_bind_group_layout(&fxaa_pipeline.texture_bind_group),
+                &BindGroupEntries::sequential((source, &fxaa_pipeline.sampler)),
+            );
+
+            let (_, bind_group) = cached.insert((source.id(), bind_group));
+            bind_group
+        }
+    };
+
+    let pass_descriptor = RenderPassDescriptor {
+        label: Some("fxaa"),
+        color_attachments: &[Some(RenderPassColorAttachment {
+            view: destination,
+            depth_slice: None,
+            resolve_target: None,
+            ops: Operations::default(),
+        })],
+        depth_stencil_attachment: None,
+        timestamp_writes: None,
+        occlusion_query_set: None,
+    };
+
+    let mut render_pass = ctx.command_encoder().begin_render_pass(&pass_descriptor);
+
+    render_pass.set_pipeline(pipeline);
+    render_pass.set_bind_group(0, bind_group, &[]);
+    render_pass.draw(0..3, 0..1);
+}