Skip to content

Commit

Permalink
Reuse VisibleEntities in check_light_mesh_visibilty (#13894)
Browse files Browse the repository at this point in the history
# Objective

- After #12582 , Bevy split visibleEntities into a TypeIdMap for
different types of entities, but the behavior in
`check_light_mesh_visibility `simply calls HashMap::clear(), which will
reallocate memory every frame.


## Testing
cargo run --release --example many_cubes --features bevy/trace_tracy --
--shadows
~10% win in `check_light_mesh_visibilty`

![image](https://github.com/bevyengine/bevy/assets/45868716/1bf4deef-bab2-4e5f-9f60-bea8b7e33e3e)
  • Loading branch information
re0312 committed Jun 17, 2024
1 parent 53910e0 commit 41ad4e9
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions crates/bevy_pbr/src/light/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -682,11 +682,11 @@ pub fn check_light_mesh_visibility(
>,
visible_entity_ranges: Option<Res<VisibleEntityRanges>>,
) {
fn shrink_entities(visible_entities: &mut VisibleEntities) {
fn shrink_entities(visible_entities: &mut Vec<Entity>) {
// Check that visible entities capacity() is no more than two times greater than len()
let capacity = visible_entities.entities.capacity();
let capacity = visible_entities.capacity();
let reserved = capacity
.checked_div(visible_entities.entities.len())
.checked_div(visible_entities.len())
.map_or(0, |reserve| {
if reserve > 2 {
capacity / (reserve / 2)
Expand All @@ -695,7 +695,7 @@ pub fn check_light_mesh_visibility(
}
});

visible_entities.entities.shrink_to(reserved);
visible_entities.shrink_to(reserved);
}

let visible_entity_ranges = visible_entity_ranges.as_deref();
Expand All @@ -712,7 +712,7 @@ pub fn check_light_mesh_visibility(
cascade_view_entities.resize(view_frusta.len(), Default::default());
cascade_view_entities
.iter_mut()
.for_each(|x| x.entities.clear());
.for_each(|x| x.clear::<WithMesh>());
}
None => views_to_remove.push(*view),
};
Expand Down Expand Up @@ -798,7 +798,10 @@ pub fn check_light_mesh_visibility(
}

for (_, cascade_view_entities) in &mut visible_entities.entities {
cascade_view_entities.iter_mut().for_each(shrink_entities);
cascade_view_entities
.iter_mut()
.map(|x| x.get_mut::<WithMesh>())
.for_each(shrink_entities);
}
}

Expand All @@ -814,7 +817,7 @@ pub fn check_light_mesh_visibility(
)) = point_lights.get_mut(light_entity)
{
for visible_entities in cubemap_visible_entities.iter_mut() {
visible_entities.entities.clear();
visible_entities.clear::<WithMesh>();
}

// NOTE: If shadow mapping is disabled for the light then it must have no visible entities
Expand Down Expand Up @@ -882,15 +885,15 @@ pub fn check_light_mesh_visibility(
}

for visible_entities in cubemap_visible_entities.iter_mut() {
shrink_entities(visible_entities);
shrink_entities(visible_entities.get_mut::<WithMesh>());
}
}

// Spot lights
if let Ok((point_light, transform, frustum, mut visible_entities, maybe_view_mask)) =
spot_lights.get_mut(light_entity)
{
visible_entities.entities.clear();
visible_entities.clear::<WithMesh>();

// NOTE: If shadow mapping is disabled for the light then it must have no visible entities
if !point_light.shadows_enabled {
Expand Down Expand Up @@ -949,7 +952,7 @@ pub fn check_light_mesh_visibility(
}
}

shrink_entities(&mut visible_entities);
shrink_entities(visible_entities.get_mut::<WithMesh>());
}
}
}
Expand Down

0 comments on commit 41ad4e9

Please sign in to comment.