added render_phase method to TrackedRenderPass

Author: kurtkuehnert

crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs

@@ -77,9 +77,12 @@ impl Node for MainPass2dNode {
                     true,
                 )
                 .begin(render_context);
-            render_pass.set_camera_viewport(&camera);
 
-            transparent_phase.render(&mut render_pass, world, view_entity);
+            render_pass.set_camera_viewport(&camera).render_phase(
+                transparent_phase,
+                world,
+                view_entity,
+            );
         }
 
         // WebGL2 quirk: if ending with a render pass with a custom viewport, the viewport isn't

crates/bevy_core_pipeline/src/core_3d/main_pass_3d_node.rs

@@ -85,9 +85,9 @@ impl Node for MainPass3dNode {
                 )
                 .depth_ops(camera_3d.depth_load_op.clone().into(), true)
                 .begin(render_context);
-            render_pass.set_camera_viewport(camera);
-
-            opaque_phase.render(&mut render_pass, world, view_entity);
+            render_pass
+                .set_camera_viewport(camera)
+                .render_phase(opaque_phase, world, view_entity);
         }
 
         if !alpha_mask_phase.items.is_empty() {
@@ -102,9 +102,11 @@ impl Node for MainPass3dNode {
                 .color_ops(LoadOp::Load, true)
                 .depth_ops(LoadOp::Load, true)
                 .begin(render_context);
-            render_pass.set_camera_viewport(camera);
-
-            alpha_mask_phase.render(&mut render_pass, world, view_entity);
+            render_pass.set_camera_viewport(camera).render_phase(
+                alpha_mask_phase,
+                world,
+                view_entity,
+            );
         }
 
         if !transparent_phase.items.is_empty() {
@@ -125,9 +127,11 @@ impl Node for MainPass3dNode {
                 .color_ops(LoadOp::Load, true)
                 .depth_ops(LoadOp::Load, true)
                 .begin(render_context);
-            render_pass.set_camera_viewport(camera);
-
-            transparent_phase.render(&mut render_pass, world, view_entity);
+            render_pass.set_camera_viewport(camera).render_phase(
+                transparent_phase,
+                world,
+                view_entity,
+            );
         }
 
         // WebGL2 quirk: if ending with a render pass with a custom viewport, the viewport isn't

crates/bevy_pbr/src/render/light.rs

@@ -1784,7 +1784,7 @@ impl Node for ShadowPassNode {
                         }),
                     });
 
-                shadow_phase.render(&mut render_pass, world, view_light_entity);
+                render_pass.render_phase(shadow_phase, world, view_entity);
             }
         }
 

crates/bevy_render/src/render_phase/draw_state.rs

@@ -1,3 +1,4 @@
+use crate::render_phase::{DrawFunctions, PhaseItem, RenderPhase};
 use crate::{
     camera::ExtractedCamera,
     render_resource::{
@@ -7,6 +8,8 @@ use crate::{
     renderer::{RenderContext, RenderDevice},
     view::{ViewDepthTexture, ViewTarget},
 };
+use bevy_ecs::entity::Entity;
+use bevy_ecs::prelude::World;
 use bevy_utils::{default, tracing::trace};
 use std::ops::Range;
 use wgpu::{
@@ -604,6 +607,22 @@ impl<'a> TrackedRenderPass<'a> {
         trace!("set blend constant: {:?}", color);
         self.pass.set_blend_constant(wgpu::Color::from(color));
     }
+
+    pub fn render_phase<P: PhaseItem>(
+        &mut self,
+        render_phase: &RenderPhase<P>,
+        world: &'a World,
+        view: Entity,
+    ) {
+        let draw_functions = world.resource::<DrawFunctions<P>>();
+        let mut draw_functions = draw_functions.write();
+        draw_functions.prepare(world);
+
+        for item in &render_phase.items {
+            let draw_function = draw_functions.get_mut(item.draw_function()).unwrap();
+            draw_function.draw(world, self, view, item);
+        }
+    }
 }
 
 pub struct TrackedRenderPassBuilder<'v> {

crates/bevy_render/src/render_phase/mod.rs

@@ -72,23 +72,6 @@ impl<I: PhaseItem> RenderPhase<I> {
     pub fn sort(&mut self) {
         I::sort(&mut self.items);
     }
-
-    /// Renders all of its [`PhaseItem`]s using their corresponding draw functions.
-    pub fn render<'w>(
-        &self,
-        render_pass: &mut TrackedRenderPass<'w>,
-        world: &'w World,
-        view: Entity,
-    ) {
-        let draw_functions = world.resource::<DrawFunctions<I>>();
-        let mut draw_functions = draw_functions.write();
-        draw_functions.prepare(world);
-
-        for item in &self.items {
-            let draw_function = draw_functions.get_mut(item.draw_function()).unwrap();
-            draw_function.draw(world, render_pass, view, item);
-        }
-    }
 }
 
 impl<I: BatchedPhaseItem> RenderPhase<I> {

crates/bevy_ui/src/render/render_pass.rs

@@ -84,7 +84,7 @@ impl Node for UiPassNode {
             .color_ops(LoadOp::Load, true)
             .begin(render_context);
 
-        transparent_phase.render(&mut render_pass, world, view_entity);
+        render_pass.render_phase(transparent_phase, world, view_entity);
 
         Ok(())
     }