migrate bloom

Author: ecoskey

crates/bevy_core_pipeline/src/bloom/downsampling_pipeline.rs

@@ -1,8 +1,8 @@
-mod downsampling_pipeline;
+mod pipeline;
 mod settings;
-mod upsampling_pipeline;
 
 use bevy_image::ToExtents;
+use settings::BloomUniforms;
 pub use settings::{Bloom, BloomCompositeMode, BloomPrefilter};
 
 use crate::{
@@ -27,15 +27,9 @@ use bevy_render::{
     view::ViewTarget,
     Render, RenderApp, RenderSystems,
 };
-use downsampling_pipeline::{
-    prepare_downsampling_pipeline, BloomDownsamplingPipeline, BloomDownsamplingPipelineIds,
-    BloomUniforms,
-};
+use pipeline::{prepare_bloom_pipelines, BloomPipelineCache, BloomPipelineIds};
 #[cfg(feature = "trace")]
 use tracing::info_span;
-use upsampling_pipeline::{
-    prepare_upsampling_pipeline, BloomUpsamplingPipeline, UpsamplingPipelineIds,
-};
 
 const BLOOM_TEXTURE_FORMAT: TextureFormat = TextureFormat::Rg11b10Ufloat;
 
@@ -57,13 +51,10 @@ impl Plugin for BloomPlugin {
             return;
         };
         render_app
-            .init_resource::<SpecializedRenderPipelines<BloomDownsamplingPipeline>>()
-            .init_resource::<SpecializedRenderPipelines<BloomUpsamplingPipeline>>()
             .add_systems(
                 Render,
                 (
-                    prepare_downsampling_pipeline.in_set(RenderSystems::Prepare),
-                    prepare_upsampling_pipeline.in_set(RenderSystems::Prepare),
+                    prepare_bloom_pipelines.in_set(RenderSystems::Prepare),
                     prepare_bloom_textures.in_set(RenderSystems::PrepareResources),
                     prepare_bloom_bind_groups.in_set(RenderSystems::PrepareBindGroups),
                 ),
@@ -86,9 +77,7 @@ impl Plugin for BloomPlugin {
         let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
             return;
         };
-        render_app
-            .init_resource::<BloomDownsamplingPipeline>()
-            .init_resource::<BloomUpsamplingPipeline>();
+        render_app.init_resource::<BloomPipelineCache>();
     }
 }
 
@@ -102,8 +91,7 @@ impl ViewNode for BloomNode {
         &'static BloomBindGroups,
         &'static DynamicUniformIndex<BloomUniforms>,
         &'static Bloom,
-        &'static UpsamplingPipelineIds,
-        &'static BloomDownsamplingPipelineIds,
+        &'static BloomPipelineIds,
     );
 
     // Atypically for a post-processing effect, we do not need to
@@ -120,31 +108,30 @@ impl ViewNode for BloomNode {
             bind_groups,
             uniform_index,
             bloom_settings,
-            upsampling_pipeline_ids,
-            downsampling_pipeline_ids,
+            bloom_pipeline_ids,
         ): QueryItem<'w, '_, Self::ViewQuery>,
         world: &'w World,
     ) -> Result<(), NodeRunError> {
         if bloom_settings.intensity == 0.0 {
             return Ok(());
         }
 
-        let downsampling_pipeline_res = world.resource::<BloomDownsamplingPipeline>();
+        let bloom_pipelines = world.resource::<BloomPipelineCache>();
         let pipeline_cache = world.resource::<PipelineCache>();
         let uniforms = world.resource::<ComponentUniforms<BloomUniforms>>();
 
         let (
             Some(uniforms),
-            Some(downsampling_first_pipeline),
-            Some(downsampling_pipeline),
-            Some(upsampling_pipeline),
-            Some(upsampling_final_pipeline),
+            Some(downsample_first_pipeline),
+            Some(downsample_main_pipeline),
+            Some(upsample_main_pipeline),
+            Some(upsample_last_pipeline),
         ) = (
             uniforms.binding(),
-            pipeline_cache.get_render_pipeline(downsampling_pipeline_ids.first),
-            pipeline_cache.get_render_pipeline(downsampling_pipeline_ids.main),
-            pipeline_cache.get_render_pipeline(upsampling_pipeline_ids.id_main),
-            pipeline_cache.get_render_pipeline(upsampling_pipeline_ids.id_final),
+            pipeline_cache.get_render_pipeline(bloom_pipeline_ids.downsample_first),
+            pipeline_cache.get_render_pipeline(bloom_pipeline_ids.downsample_main),
+            pipeline_cache.get_render_pipeline(bloom_pipeline_ids.upsample_main),
+            pipeline_cache.get_render_pipeline(bloom_pipeline_ids.upsample_last),
         )
         else {
             return Ok(());
@@ -169,7 +156,7 @@ impl ViewNode for BloomNode {
             {
                 let downsampling_first_bind_group = render_device.create_bind_group(
                     "bloom_downsampling_first_bind_group",
-                    &downsampling_pipeline_res.bind_group_layout,
+                    &bloom_pipelines.downsample.specializer().bind_group_layout,
                     &BindGroupEntries::sequential((
                         // Read from main texture directly
                         view_texture,
@@ -191,7 +178,7 @@ impl ViewNode for BloomNode {
                         timestamp_writes: None,
                         occlusion_query_set: None,
                     });
-                downsampling_first_pass.set_pipeline(downsampling_first_pipeline);
+                downsampling_first_pass.set_pipeline(downsample_first_pipeline);
                 downsampling_first_pass.set_bind_group(
                     0,
                     &downsampling_first_bind_group,
@@ -215,7 +202,7 @@ impl ViewNode for BloomNode {
                         timestamp_writes: None,
                         occlusion_query_set: None,
                     });
-                downsampling_pass.set_pipeline(downsampling_pipeline);
+                downsampling_pass.set_pipeline(downsample_main_pipeline);
                 downsampling_pass.set_bind_group(
                     0,
                     &bind_groups.downsampling_bind_groups[mip as usize - 1],
@@ -242,7 +229,7 @@ impl ViewNode for BloomNode {
                         timestamp_writes: None,
                         occlusion_query_set: None,
                     });
-                upsampling_pass.set_pipeline(upsampling_pipeline);
+                upsampling_pass.set_pipeline(upsample_main_pipeline);
                 upsampling_pass.set_bind_group(
                     0,
                     &bind_groups.upsampling_bind_groups
@@ -270,7 +257,7 @@ impl ViewNode for BloomNode {
                         timestamp_writes: None,
                         occlusion_query_set: None,
                     });
-                upsampling_final_pass.set_pipeline(upsampling_final_pipeline);
+                upsampling_final_pass.set_pipeline(upsample_last_pipeline);
                 upsampling_final_pass.set_bind_group(
                     0,
                     &bind_groups.upsampling_bind_groups[(bloom_texture.mip_count - 1) as usize],
@@ -413,12 +400,11 @@ struct BloomBindGroups {
 fn prepare_bloom_bind_groups(
     mut commands: Commands,
     render_device: Res<RenderDevice>,
-    downsampling_pipeline: Res<BloomDownsamplingPipeline>,
-    upsampling_pipeline: Res<BloomUpsamplingPipeline>,
+    bloom_pipelines: Res<BloomPipelineCache>,
     views: Query<(Entity, &BloomTexture)>,
     uniforms: Res<ComponentUniforms<BloomUniforms>>,
 ) {
-    let sampler = &downsampling_pipeline.sampler;
+    let sampler = &bloom_pipelines.downsample.specializer().sampler;
 
     for (entity, bloom_texture) in &views {
         let bind_group_count = bloom_texture.mip_count as usize - 1;
@@ -427,7 +413,7 @@ fn prepare_bloom_bind_groups(
         for mip in 1..bloom_texture.mip_count {
             downsampling_bind_groups.push(render_device.create_bind_group(
                 "bloom_downsampling_bind_group",
-                &downsampling_pipeline.bind_group_layout,
+                &bloom_pipelines.downsample.specializer().bind_group_layout,
                 &BindGroupEntries::sequential((
                     &bloom_texture.view(mip - 1),
                     sampler,
@@ -440,7 +426,7 @@ fn prepare_bloom_bind_groups(
         for mip in (0..bloom_texture.mip_count).rev() {
             upsampling_bind_groups.push(render_device.create_bind_group(
                 "bloom_upsampling_bind_group",
-                &upsampling_pipeline.bind_group_layout,
+                &bloom_pipelines.upsample.specializer().bind_group_layout,
                 &BindGroupEntries::sequential((
                     &bloom_texture.view(mip),
                     sampler,