HACK merge transparent pass into opaque pass

Author: HackerFoo

crates/bevy_core_pipeline/src/core_3d/main_opaque_pass_3d_node.rs

@@ -1,5 +1,5 @@
 use crate::{
-    core_3d::Opaque3d,
+    core_3d::{Opaque3d, Transparent3d, ViewSortedRenderPhases},
     skybox::{SkyboxBindGroup, SkyboxPipelineId},
 };
 use bevy_ecs::{entity::Entity, prelude::World, query::QueryItem};
@@ -48,23 +48,24 @@ impl ViewNode for MainOpaquePass3dNode {
         ): QueryItem<'w, Self::ViewQuery>,
         world: &'w World,
     ) -> Result<(), NodeRunError> {
-        let (Some(opaque_phases), Some(alpha_mask_phases)) = (
+        let (Some(opaque_phases), Some(alpha_mask_phases), Some(transparent_phases)) = (
             world.get_resource::<ViewBinnedRenderPhases<Opaque3d>>(),
             world.get_resource::<ViewBinnedRenderPhases<AlphaMask3d>>(),
+            world.get_resource::<ViewSortedRenderPhases<Transparent3d>>(),
         ) else {
             return Ok(());
         };
 
-        let (Some(opaque_phase), Some(alpha_mask_phase)) =
-            (opaque_phases.get(&view), alpha_mask_phases.get(&view))
+        let (Some(opaque_phase), Some(alpha_mask_phase), Some(transparent_phase)) =
+            (opaque_phases.get(&view), alpha_mask_phases.get(&view), transparent_phases.get(&view))
         else {
             return Ok(());
         };
 
         let diagnostics = render_context.diagnostic_recorder();
 
         let color_attachments = [Some(target.get_color_attachment())];
-        let depth_stencil_attachment = Some(depth.get_attachment(StoreOp::Store));
+        let depth_stencil_attachment = Some(depth.get_attachment(StoreOp::Discard));
 
         let view_entity = graph.view_entity();
         render_context.add_command_buffer_generation_task(move |render_device| {
@@ -110,6 +111,15 @@ impl ViewNode for MainOpaquePass3dNode {
                 }
             }
 
+            // Alpha draws
+            if !transparent_phase.items.is_empty() {
+                #[cfg(feature = "trace")]
+                let _transparent_main_pass_3d_span = info_span!("transparent_main_pass_3d").entered();
+                if let Err(err) = transparent_phase.render(&mut render_pass, world, view_entity) {
+                    error!("Error encountered while rendering the alpha mask phase {err:?}");
+                }
+            }
+
             // Skybox draw using a fullscreen triangle
             if let (Some(skybox_pipeline), Some(SkyboxBindGroup(skybox_bind_group))) =
                 (skybox_pipeline, skybox_bind_group)

crates/bevy_core_pipeline/src/core_3d/mod.rs

@@ -181,10 +181,10 @@ impl Plugin for Core3dPlugin {
                 Core3d,
                 Node3d::MainTransmissivePass,
             )
-            .add_render_graph_node::<ViewNodeRunner<MainTransparentPass3dNode>>(
-                Core3d,
-                Node3d::MainTransparentPass,
-            )
+            // .add_render_graph_node::<ViewNodeRunner<MainTransparentPass3dNode>>(
+            //     Core3d,
+            //     Node3d::MainTransparentPass,
+            // )
             .add_render_graph_node::<EmptyNode>(Core3d, Node3d::EndMainPass)
             .add_render_graph_node::<ViewNodeRunner<DepthOfFieldNode>>(Core3d, Node3d::DepthOfField)
             .add_render_graph_node::<ViewNodeRunner<TonemappingNode>>(Core3d, Node3d::Tonemapping)
@@ -200,7 +200,7 @@ impl Plugin for Core3dPlugin {
                     Node3d::StartMainPass,
                     Node3d::MainOpaquePass,
                     Node3d::MainTransmissivePass,
-                    Node3d::MainTransparentPass,
+                    // Node3d::MainTransparentPass,
                     Node3d::EndMainPass,
                     Node3d::Tonemapping,
                     Node3d::EndMainPassPostProcessing,

crates/bevy_core_pipeline/src/oit/mod.rs

@@ -129,7 +129,7 @@ impl Plugin for OrderIndependentTransparencyPlugin {
             .add_render_graph_edges(
                 Core3d,
                 (
-                    Node3d::MainTransparentPass,
+                    Node3d::MainTransmissivePass,
                     OitResolvePass,
                     Node3d::EndMainPass,
                 ),

crates/bevy_render/src/texture/texture_attachment.rs

@@ -46,7 +46,7 @@ impl ColorAttachment {
                         (Some(clear_color), true) => LoadOp::Clear(clear_color.into()),
                         (None, _) | (Some(_), false) => LoadOp::Load,
                     },
-                    store: StoreOp::Store,
+                    store: StoreOp::Discard, // HACK
                 },
             }
         } else {