updated remaining post-processing nodes to make use of the new builder API

kurtkuehnert · kurtkuehnert · commit 26dc71f02033 · 2023-01-23T15:04:41.000+01:00
diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs
@@ -246,7 +246,7 @@ impl Node for BloomNode {
                 .add_color_attachment(view)
                 .begin()
                 .set_camera_viewport(camera)
-                .set_render_pipeline(downsampling_prefilter_pipeline)
+                .set_pipeline(downsampling_prefilter_pipeline)
                 .set_bind_group(
                     0,
                     &bind_groups.prefilter_bind_group,
@@ -264,7 +264,7 @@ impl Node for BloomNode {
                 .add_color_attachment(view)
                 .begin()
                 .set_camera_viewport(camera)
-                .set_render_pipeline(downsampling_pipeline)
+                .set_pipeline(downsampling_pipeline)
                 .set_bind_group(
                     0,
                     &bind_groups.downsampling_bind_groups[mip as usize - 1],
@@ -282,7 +282,7 @@ impl Node for BloomNode {
                 .add_color_attachment(view)
                 .begin()
                 .set_camera_viewport(camera)
-                .set_render_pipeline(upsampling_pipeline)
+                .set_pipeline(upsampling_pipeline)
                 .set_bind_group(
                     0,
                     &bind_groups.upsampling_bind_groups[mip as usize - 1],
@@ -299,7 +299,7 @@ impl Node for BloomNode {
                 .set_color_ops(LoadOp::Load, true)
                 .begin()
                 .set_camera_viewport(camera)
-                .set_render_pipeline(upsampling_final_pipeline)
+                .set_pipeline(upsampling_final_pipeline)
                 .set_bind_group(
                     0,
                     &bind_groups.upsampling_final_bind_group,
diff --git a/crates/bevy_core_pipeline/src/fxaa/node.rs b/crates/bevy_core_pipeline/src/fxaa/node.rs
@@ -1,19 +1,16 @@
-use std::sync::Mutex;
-
 use crate::fxaa::{CameraFxaaPipeline, Fxaa, FxaaPipeline};
-use bevy_ecs::prelude::*;
-use bevy_ecs::query::QueryState;
+use bevy_ecs::{prelude::*, query::QueryState};
 use bevy_render::{
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
     render_resource::{
-        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, FilterMode, Operations,
-        PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
-        TextureViewId,
+        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, FilterMode, PipelineCache,
+        SamplerDescriptor, TextureViewId,
     },
     renderer::RenderContext,
     view::{ExtractedView, ViewTarget},
 };
 use bevy_utils::default;
+use std::sync::Mutex;
 
 pub struct FxaaNode {
     query: QueryState<
@@ -109,23 +106,14 @@ impl Node for FxaaNode {
             }
         };
 
-        let pass_descriptor = RenderPassDescriptor {
-            label: Some("fxaa_pass"),
-            color_attachments: &[Some(RenderPassColorAttachment {
-                view: destination,
-                resolve_target: None,
-                ops: Operations::default(),
-            })],
-            depth_stencil_attachment: None,
-        };
-
-        let mut render_pass = render_context
-            .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);
+        render_context
+            .render_pass(view_entity)
+            .set_label("fxaa_pass")
+            .add_color_attachment(destination)
+            .begin()
+            .set_pipeline(pipeline)
+            .set_bind_group(0, bind_group, &[])
+            .draw(0..3, 0..1);
 
         Ok(())
     }
diff --git a/crates/bevy_core_pipeline/src/tonemapping/node.rs b/crates/bevy_core_pipeline/src/tonemapping/node.rs
@@ -1,18 +1,15 @@
-use std::sync::Mutex;
-
 use crate::tonemapping::{TonemappingPipeline, ViewTonemappingPipeline};
-use bevy_ecs::prelude::*;
-use bevy_ecs::query::QueryState;
+use bevy_ecs::{prelude::*, query::QueryState};
 use bevy_render::{
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
     render_resource::{
-        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, LoadOp, Operations,
-        PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
-        TextureViewId,
+        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, LoadOp, PipelineCache,
+        SamplerDescriptor, TextureViewId,
     },
     renderer::RenderContext,
     view::{ExtractedView, ViewTarget},
 };
+use std::sync::Mutex;
 
 pub struct TonemappingNode {
     query: QueryState<(&'static ViewTarget, &'static ViewTonemappingPipeline), With<ExtractedView>>,
@@ -98,26 +95,15 @@ impl Node for TonemappingNode {
             }
         };
 
-        let pass_descriptor = RenderPassDescriptor {
-            label: Some("tonemapping_pass"),
-            color_attachments: &[Some(RenderPassColorAttachment {
-                view: destination,
-                resolve_target: None,
-                ops: Operations {
-                    load: LoadOp::Clear(Default::default()), // TODO shouldn't need to be cleared
-                    store: true,
-                },
-            })],
-            depth_stencil_attachment: None,
-        };
-
-        let mut render_pass = render_context
-            .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);
+        render_context
+            .render_pass(view_entity)
+            .set_label("tonemapping_pass")
+            .add_color_attachment(destination)
+            .set_color_ops(LoadOp::Clear(Default::default()), true)
+            .begin()
+            .set_pipeline(pipeline)
+            .set_bind_group(0, bind_group, &[])
+            .draw(0..3, 0..1);
 
         Ok(())
     }
diff --git a/crates/bevy_core_pipeline/src/upscaling/node.rs b/crates/bevy_core_pipeline/src/upscaling/node.rs
@@ -1,19 +1,15 @@
-use std::sync::Mutex;
-
-use bevy_ecs::prelude::*;
-use bevy_ecs::query::QueryState;
+use super::{UpscalingPipeline, ViewUpscalingPipeline};
+use bevy_ecs::{prelude::*, query::QueryState};
 use bevy_render::{
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
     render_resource::{
-        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, LoadOp, Operations,
-        PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
-        TextureViewId,
+        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, LoadOp, PipelineCache,
+        SamplerDescriptor, TextureViewId,
     },
     renderer::RenderContext,
     view::{ExtractedView, ViewTarget},
 };
-
-use super::{UpscalingPipeline, ViewUpscalingPipeline};
+use std::sync::Mutex;
 
 pub struct UpscalingNode {
     query: QueryState<(&'static ViewTarget, &'static ViewUpscalingPipeline), With<ExtractedView>>,
@@ -51,9 +47,8 @@ impl Node for UpscalingNode {
         let pipeline_cache = world.get_resource::<PipelineCache>().unwrap();
         let upscaling_pipeline = world.get_resource::<UpscalingPipeline>().unwrap();
 
-        let (target, upscaling_target) = match self.query.get_manual(world, view_entity) {
-            Ok(query) => query,
-            Err(_) => return Ok(()),
+        let Ok((target, upscaling_target)) = self.query.get_manual(world, view_entity) else {
+            return Ok(());
         };
 
         let upscaled_texture = target.main_texture();
@@ -89,31 +84,19 @@ impl Node for UpscalingNode {
             }
         };
 
-        let pipeline = match pipeline_cache.get_render_pipeline(upscaling_target.0) {
-            Some(pipeline) => pipeline,
-            None => return Ok(()),
-        };
-
-        let pass_descriptor = RenderPassDescriptor {
-            label: Some("upscaling_pass"),
-            color_attachments: &[Some(RenderPassColorAttachment {
-                view: target.out_texture(),
-                resolve_target: None,
-                ops: Operations {
-                    load: LoadOp::Clear(Default::default()),
-                    store: true,
-                },
-            })],
-            depth_stencil_attachment: None,
+        let Some(pipeline) =  pipeline_cache.get_render_pipeline(upscaling_target.0) else {
+            return Ok(());
         };
 
-        let mut render_pass = render_context
-            .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);
+        render_context
+            .render_pass(view_entity)
+            .set_label("upscaling_pass")
+            .add_color_attachment(target.out_texture())
+            .set_color_ops(LoadOp::Clear(Default::default()), true)
+            .begin()
+            .set_pipeline(pipeline)
+            .set_bind_group(0, bind_group, &[])
+            .draw(0..3, 0..1);
 
         Ok(())
     }
diff --git a/crates/bevy_render/src/render_phase/draw_state.rs b/crates/bevy_render/src/render_phase/draw_state.rs
@@ -131,8 +131,8 @@ impl<'a> TrackedRenderPass<'a> {
 
     /// Sets the active [`RenderPipeline`].
     ///
-    /// Subsequent draw calls will exhibit the behavior defined by the `pipeline`.
-    pub fn set_render_pipeline(&mut self, pipeline: &'a RenderPipeline) -> &mut Self {
+    /// Subsequent draw calls will exhibit the behavior defined by this `pipeline`.
+    pub fn set_pipeline(&mut self, pipeline: &'a RenderPipeline) -> &mut Self {
         trace!("set pipeline: {:?}", pipeline);
         if self.state.is_pipeline_set(pipeline.id()) {
             return self;
diff --git a/crates/bevy_render/src/render_phase/mod.rs b/crates/bevy_render/src/render_phase/mod.rs
@@ -177,7 +177,7 @@ impl<P: CachedRenderPipelinePhaseItem> RenderCommand<P> for SetItemPipeline {
             .into_inner()
             .get_render_pipeline(item.cached_pipeline())
         {
-            pass.set_render_pipeline(pipeline);
+            pass.set_pipeline(pipeline);
             RenderCommandResult::Success
         } else {
             RenderCommandResult::Failure

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ impl<P: CachedRenderPipelinePhaseItem> RenderCommand<P> for SetItemPipeline {`
`177`	`177`	`.into_inner()`
`178`	`178`	`.get_render_pipeline(item.cached_pipeline())`
`179`	`179`	`{`
`180`		`- pass.set_render_pipeline(pipeline);`
	`180`	`+ pass.set_pipeline(pipeline);`
`181`	`181`	`RenderCommandResult::Success`
`182`	`182`	`} else {`
`183`	`183`	`RenderCommandResult::Failure`