Skip to content

Convert MeshPipelineViewLayouts and MeshPipeline to RenderStartup system #22443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zeophlite wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Convert MeshPipelineViewLayouts and MeshPipeline to RenderStartup system #22443

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0182759
Convert MeshPipelineViewLayouts and MeshPipeline to RenderStartup system
Zeophlite Oct 14, 2025
903f2ef
Fix ordering
Zeophlite Jan 9, 2026
4693a1d
Don't use world
Zeophlite Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions crates/bevy_pbr/src/render/mesh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ impl Plugin for MeshRenderPlugin {
}

render_app
.init_resource::<MeshPipelineViewLayouts>()
.init_resource::<MeshPipeline>();
.add_systems(RenderStartup, init_mesh_pipeline_view_layouts)
.add_systems(RenderStartup, init_mesh_pipeline);
}

// Load the mesh_bindings shader module here as it depends on runtime information about
Expand Down Expand Up @@ -1881,35 +1881,35 @@ pub struct MeshPipeline {
pub skins_use_uniform_buffers: bool,
}

impl FromWorld for MeshPipeline {
fn from_world(world: &mut World) -> Self {
let shader = load_embedded_asset!(world, "mesh.wgsl");
let mut system_state: SystemState<(
Res<RenderDevice>,
Res<RenderAdapter>,
Res<MeshPipelineViewLayouts>,
)> = SystemState::new(world);
let (render_device, render_adapter, view_layouts) = system_state.get_mut(world);

let clustered_forward_buffer_binding_type = render_device
.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT);

MeshPipeline {
view_layouts: view_layouts.clone(),
clustered_forward_buffer_binding_type,
mesh_layouts: MeshLayouts::new(&render_device, &render_adapter),
shader,
per_object_buffer_batch_size: GpuArrayBuffer::<MeshUniform>::batch_size(
&render_device.limits(),
),
binding_arrays_are_usable: binding_arrays_are_usable(&render_device, &render_adapter),
clustered_decals_are_usable: decal::clustered::clustered_decals_are_usable(
&render_device,
&render_adapter,
),
skins_use_uniform_buffers: skins_use_uniform_buffers(&render_device.limits()),
}
}
fn init_mesh_pipeline(world: &mut World) {
let shader = load_embedded_asset!(world, "mesh.wgsl");
let mut system_state: SystemState<(
Res<RenderDevice>,
Res<RenderAdapter>,
Res<MeshPipelineViewLayouts>,
)> = SystemState::new(world);
let (render_device, render_adapter, view_layouts) = system_state.get_mut(world);

let clustered_forward_buffer_binding_type =
render_device.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT);

let res = MeshPipeline {
view_layouts: view_layouts.clone(),
clustered_forward_buffer_binding_type,
mesh_layouts: MeshLayouts::new(&render_device, &render_adapter),
shader,
per_object_buffer_batch_size: GpuArrayBuffer::<MeshUniform>::batch_size(
&render_device.limits(),
),
binding_arrays_are_usable: binding_arrays_are_usable(&render_device, &render_adapter),
clustered_decals_are_usable: decal::clustered::clustered_decals_are_usable(
&render_device,
&render_adapter,
),
skins_use_uniform_buffers: skins_use_uniform_buffers(&render_device.limits()),
};

world.insert_resource(res);
}

impl MeshPipeline {
Expand Down
86 changes: 43 additions & 43 deletions crates/bevy_pbr/src/render/mesh_view_bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use bevy_ecs::{
query::Has,
resource::Resource,
system::{Commands, Query, Res},
world::{FromWorld, World},
world::World,
};
use bevy_image::BevyDefault as _;
use bevy_light::{EnvironmentMapLight, IrradianceVolume};
Expand Down Expand Up @@ -450,49 +450,49 @@ pub struct MeshPipelineViewLayouts(
pub Arc<[MeshPipelineViewLayout; MeshPipelineViewLayoutKey::COUNT]>,
);

impl FromWorld for MeshPipelineViewLayouts {
fn from_world(world: &mut World) -> Self {
// Generates all possible view layouts for the mesh pipeline, based on all combinations of
// [`MeshPipelineViewLayoutKey`] flags.

let render_device = world.resource::<RenderDevice>();
let render_adapter = world.resource::<RenderAdapter>();

let clustered_forward_buffer_binding_type = render_device
.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT);
let visibility_ranges_buffer_binding_type = render_device
.get_supported_read_only_binding_type(VISIBILITY_RANGES_STORAGE_BUFFER_COUNT);

Self(Arc::new(array::from_fn(|i| {
let key = MeshPipelineViewLayoutKey::from_bits_truncate(i as u32);
let entries = layout_entries(
clustered_forward_buffer_binding_type,
visibility_ranges_buffer_binding_type,
key,
render_device,
render_adapter,
);
pub fn init_mesh_pipeline_view_layouts(world: &mut World) {
// Generates all possible view layouts for the mesh pipeline, based on all combinations of
// [`MeshPipelineViewLayoutKey`] flags.

let render_device = world.resource::<RenderDevice>();
let render_adapter = world.resource::<RenderAdapter>();

let clustered_forward_buffer_binding_type =
render_device.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT);
let visibility_ranges_buffer_binding_type =
render_device.get_supported_read_only_binding_type(VISIBILITY_RANGES_STORAGE_BUFFER_COUNT);

let res = MeshPipelineViewLayouts(Arc::new(array::from_fn(|i| {
let key = MeshPipelineViewLayoutKey::from_bits_truncate(i as u32);
let entries = layout_entries(
clustered_forward_buffer_binding_type,
visibility_ranges_buffer_binding_type,
key,
render_device,
render_adapter,
);
#[cfg(debug_assertions)]
let texture_count: usize = entries
.iter()
.flat_map(|e| {
e.iter()
.filter(|entry| matches!(entry.ty, BindingType::Texture { .. }))
})
.count();

MeshPipelineViewLayout {
main_layout: BindGroupLayoutDescriptor::new(key.label(), &entries[0]),
binding_array_layout: BindGroupLayoutDescriptor::new(
format!("{}_binding_array", key.label()),
&entries[1],
),
empty_layout: BindGroupLayoutDescriptor::new(format!("{}_empty", key.label()), &[]),
#[cfg(debug_assertions)]
let texture_count: usize = entries
.iter()
.flat_map(|e| {
e.iter()
.filter(|entry| matches!(entry.ty, BindingType::Texture { .. }))
})
.count();

MeshPipelineViewLayout {
main_layout: BindGroupLayoutDescriptor::new(key.label(), &entries[0]),
binding_array_layout: BindGroupLayoutDescriptor::new(
format!("{}_binding_array", key.label()),
&entries[1],
),
empty_layout: BindGroupLayoutDescriptor::new(format!("{}_empty", key.label()), &[]),
#[cfg(debug_assertions)]
texture_count,
}
})))
}
texture_count,
}
})));

world.insert_resource(res);
}

impl MeshPipelineViewLayouts {
Expand Down
Loading