Skip to content

Commit c847aaf

Browse files
authored
Rename MeshPipelineSet to MeshPipelineSystems (#23823)
# Objective According to #18900 , rename `MeshPipelineSet` to `MeshPipelineSystems` for a consistent naming convention. `MeshPipelineSet` was introduced in this cycle, so no migration guide required. ## Testing ``` cargo run --example specialized_mesh_pipeline ```
1 parent 01804de commit c847aaf

12 files changed

Lines changed: 31 additions & 22 deletions

File tree

_release-content/migration-guides/meshpipelineset-renderstartup-systems.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ title: Resources `MeshPipelineViewLayouts`, `MeshPipeline` and `RenderDebugOverl
33
pull_requests: [22443]
44
---
55

6-
Systems using the `MeshPipelineViewLayouts`, `MeshPipeline` and `RenderDebugOverlayPipeline` resources in the `RenderStartup` schedule now need to be run after the `MeshPipelineSet` system set.
6+
Systems using the `MeshPipelineViewLayouts`, `MeshPipeline` and `RenderDebugOverlayPipeline` resources in the `RenderStartup` schedule now need to be run after the `MeshPipelineSystems` system set.

crates/bevy_dev_tools/src/render_debug.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use bevy_shader::Shader;
4343
use bevy_ui_render::render_pass::ui_pass;
4444

4545
use bevy_pbr::{
46-
Bluenoise, MeshPipelineSet, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts,
46+
Bluenoise, MeshPipelineSystems, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts,
4747
MeshViewBindGroup, ViewContactShadowsUniformOffset, ViewEnvironmentMapUniformOffset,
4848
ViewFogUniformOffset, ViewLightProbesUniformOffset, ViewLightsUniformOffset,
4949
ViewScreenSpaceReflectionsUniformOffset,
@@ -73,7 +73,7 @@ impl Plugin for RenderDebugOverlayPlugin {
7373

7474
render_app.add_systems(
7575
RenderStartup,
76-
init_render_debug_overlay_pipeline.after(MeshPipelineSet),
76+
init_render_debug_overlay_pipeline.after(MeshPipelineSystems),
7777
);
7878
}
7979

crates/bevy_gizmos_render/src/pipeline_3d.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use bevy_ecs::{
1717
system::{Commands, Query, Res, ResMut},
1818
};
1919
use bevy_pbr::{
20-
MeshPipeline, MeshPipelineKey, MeshPipelineSet, SetMeshViewBindGroup, ViewKeyCache,
20+
MeshPipeline, MeshPipelineKey, MeshPipelineSystems, SetMeshViewBindGroup, ViewKeyCache,
2121
};
2222
use bevy_render::{
2323
render_asset::{prepare_assets, RenderAssets},
@@ -54,7 +54,7 @@ impl Plugin for LineGizmo3dPlugin {
5454
RenderStartup,
5555
init_line_gizmo_pipelines
5656
.after(init_line_gizmo_uniform_bind_group_layout)
57-
.after(MeshPipelineSet),
57+
.after(MeshPipelineSystems),
5858
)
5959
.add_systems(
6060
Render,

crates/bevy_pbr/src/deferred/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::{
2-
DistanceFog, ExtractedAtmosphere, MeshPipeline, MeshPipelineKey, MeshPipelineSet,
2+
DistanceFog, ExtractedAtmosphere, MeshPipeline, MeshPipelineKey, MeshPipelineSystems,
33
MeshViewBindGroup, RenderViewLightProbes, ScreenSpaceAmbientOcclusion,
44
ScreenSpaceReflectionsUniform, ViewContactShadowsUniformOffset,
55
ViewEnvironmentMapUniformOffset, ViewFogUniformOffset, ViewLightProbesUniformOffset,
@@ -108,7 +108,7 @@ impl Plugin for DeferredPbrLightingPlugin {
108108
.init_gpu_resource::<SpecializedRenderPipelines<DeferredLightingLayout>>()
109109
.add_systems(
110110
RenderStartup,
111-
init_deferred_lighting_layout.after(MeshPipelineSet),
111+
init_deferred_lighting_layout.after(MeshPipelineSystems),
112112
)
113113
.add_systems(
114114
Render,

crates/bevy_pbr/src/material.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,10 @@ impl Plugin for MaterialsPlugin {
307307
.add_render_command::<Transparent3d, DrawMaterial>()
308308
.add_render_command::<Opaque3d, DrawMaterial>()
309309
.add_render_command::<AlphaMask3d, DrawMaterial>()
310-
.add_systems(RenderStartup, init_material_pipeline.after(MeshPipelineSet))
310+
.add_systems(
311+
RenderStartup,
312+
init_material_pipeline.after(MeshPipelineSystems),
313+
)
311314
.add_systems(
312315
Render,
313316
(

crates/bevy_pbr/src/render/mesh.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl MeshRenderPlugin {
143143
pub const MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES: usize = 10;
144144

145145
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
146-
pub struct MeshPipelineSet;
146+
pub struct MeshPipelineSystems;
147147

148148
impl Plugin for MeshRenderPlugin {
149149
fn build(&self, app: &mut App) {
@@ -321,7 +321,7 @@ impl Plugin for MeshRenderPlugin {
321321
RenderStartup,
322322
(init_mesh_pipeline_view_layouts, init_mesh_pipeline)
323323
.chain()
324-
.in_set(MeshPipelineSet),
324+
.in_set(MeshPipelineSystems),
325325
);
326326
}
327327

crates/bevy_pbr/src/ssr/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use tracing::info;
4747

4848
use crate::{
4949
binding_arrays_are_usable, contact_shadows::ViewContactShadowsUniformOffset,
50-
deferred::deferred_lighting, Bluenoise, ExtractedAtmosphere, MeshPipelineSet,
50+
deferred::deferred_lighting, Bluenoise, ExtractedAtmosphere, MeshPipelineSystems,
5151
MeshPipelineViewLayoutKey, MeshPipelineViewLayouts, MeshViewBindGroup, RenderViewLightProbes,
5252
ViewEnvironmentMapUniformOffset, ViewFogUniformOffset, ViewLightProbesUniformOffset,
5353
ViewLightsUniformOffset,
@@ -212,7 +212,7 @@ impl Plugin for ScreenSpaceReflectionsPlugin {
212212
.init_gpu_resource::<SpecializedRenderPipelines<ScreenSpaceReflectionsPipeline>>()
213213
.add_systems(
214214
RenderStartup,
215-
init_screen_space_reflections_pipeline.after(MeshPipelineSet),
215+
init_screen_space_reflections_pipeline.after(MeshPipelineSystems),
216216
)
217217
.add_systems(Render, prepare_ssr_pipelines.in_set(RenderSystems::Prepare))
218218
.add_systems(

crates/bevy_pbr/src/volumetric_fog/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use bevy_render::{
4949
};
5050
use render::{volumetric_fog, VolumetricFogPipeline, VolumetricFogUniformBuffer};
5151

52-
use crate::{volumetric_fog::render::init_volumetric_fog_pipeline, MeshPipelineSet};
52+
use crate::{volumetric_fog::render::init_volumetric_fog_pipeline, MeshPipelineSystems};
5353

5454
pub mod render;
5555

@@ -85,7 +85,7 @@ impl Plugin for VolumetricFogPlugin {
8585
.init_gpu_resource::<VolumetricFogUniformBuffer>()
8686
.add_systems(
8787
RenderStartup,
88-
init_volumetric_fog_pipeline.after(MeshPipelineSet),
88+
init_volumetric_fog_pipeline.after(MeshPipelineSystems),
8989
)
9090
.add_systems(ExtractSchedule, render::extract_volumetric_fog)
9191
.add_systems(

crates/bevy_pbr/src/wireframe.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::{
22
collect_meshes_for_gpu_building,
33
render::{PreprocessBindGroups, PreprocessPipelines},
4-
set_mesh_motion_vector_flags, DrawMesh, MeshPipeline, MeshPipelineKey, MeshPipelineSet,
4+
set_mesh_motion_vector_flags, DrawMesh, MeshPipeline, MeshPipelineKey, MeshPipelineSystems,
55
RenderLightmaps, RenderMeshInstanceFlags, RenderMeshInstances, SetMeshBindGroup,
66
SetMeshViewBindGroup, SetMeshViewBindingArrayBindGroup, ViewKeyCache,
77
};
@@ -152,7 +152,7 @@ impl Plugin for WireframePlugin {
152152
.init_gpu_resource::<PendingWireframeQueues>()
153153
.add_systems(
154154
RenderStartup,
155-
init_wireframe_3d_pipeline.after(MeshPipelineSet),
155+
init_wireframe_3d_pipeline.after(MeshPipelineSystems),
156156
)
157157
.add_systems(
158158
Core3d,

examples/shader_advanced/custom_render_phase.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::ops::Range;
1515
use bevy::camera::Viewport;
1616
use bevy::core_pipeline::core_3d::TransparentSortingInfo3d;
1717
use bevy::math::Affine3Ext;
18-
use bevy::pbr::{MeshPipelineSet, SetMeshViewEmptyBindGroup, ViewKeyCache};
18+
use bevy::pbr::{MeshPipelineSystems, SetMeshViewEmptyBindGroup, ViewKeyCache};
1919
use bevy::{
2020
camera::MainPassResolutionOverride,
2121
core_pipeline::{core_3d::main_opaque_pass_3d, schedule::Core3d, Core3dSystems},
@@ -131,7 +131,10 @@ impl Plugin for MeshStencilPhasePlugin {
131131
.add_render_command::<Stencil3d, DrawMesh3dStencil>()
132132
.init_resource::<ViewSortedRenderPhases<Stencil3d>>()
133133
.init_resource::<PendingCustomMeshQueues>()
134-
.add_systems(RenderStartup, init_stencil_pipeline.after(MeshPipelineSet))
134+
.add_systems(
135+
RenderStartup,
136+
init_stencil_pipeline.after(MeshPipelineSystems),
137+
)
135138
.add_systems(ExtractSchedule, extract_camera_phases)
136139
.add_systems(
137140
Render,

0 commit comments

Comments
 (0)