
# Objective Improve the performance of `FilteredEntity(Ref|Mut)` and `Entity(Ref|Mut)Except`. `FilteredEntityRef` needs an `Access<ComponentId>` to determine what components it can access. There is one stored in the query state, but query items cannot borrow from the state, so it has to `clone()` the access for each row. Cloning the access involves memory allocations and can be expensive. ## Solution Let query items borrow from their query state. Add an `'s` lifetime to `WorldQuery::Item` and `WorldQuery::Fetch`, similar to the one in `SystemParam`, and provide `&'s Self::State` to the fetch so that it can borrow from the state. Unfortunately, there are a few cases where we currently return query items from temporary query states: the sorted iteration methods create a temporary state to query the sort keys, and the `EntityRef::components<Q>()` methods create a temporary state for their query. To allow these to continue to work with most `QueryData` implementations, introduce a new subtrait `ReleaseStateQueryData` that converts a `QueryItem<'w, 's>` to `QueryItem<'w, 'static>`, and is implemented for everything except `FilteredEntity(Ref|Mut)` and `Entity(Ref|Mut)Except`. `#[derive(QueryData)]` will generate `ReleaseStateQueryData` implementations that apply when all of the subqueries implement `ReleaseStateQueryData`. This PR does not actually change the implementation of `FilteredEntity(Ref|Mut)` or `Entity(Ref|Mut)Except`! That will be done as a follow-up PR so that the changes are easier to review. I have pushed the changes as chescock/bevy#5. ## Testing I ran performance traces of many_foxes, both against main and against chescock/bevy#5, both including #15282. These changes do appear to make generalized animation a bit faster: (Red is main, yellow is chescock/bevy#5)  ## Migration Guide The `WorldQuery::Item` and `WorldQuery::Fetch` associated types and the `QueryItem` and `ROQueryItem` type aliases now have an additional lifetime parameter corresponding to the `'s` lifetime in `Query`. Manual implementations of `WorldQuery` will need to update the method signatures to include the new lifetimes. Other uses of the types will need to be updated to include a lifetime parameter, although it can usually be passed as `'_`. In particular, `ROQueryItem` is used when implementing `RenderCommand`. Before: ```rust fn render<'w>( item: &P, view: ROQueryItem<'w, Self::ViewQuery>, entity: Option<ROQueryItem<'w, Self::ItemQuery>>, param: SystemParamItem<'w, '_, Self::Param>, pass: &mut TrackedRenderPass<'w>, ) -> RenderCommandResult; ``` After: ```rust fn render<'w>( item: &P, view: ROQueryItem<'w, '_, Self::ViewQuery>, entity: Option<ROQueryItem<'w, '_, Self::ItemQuery>>, param: SystemParamItem<'w, '_, Self::Param>, pass: &mut TrackedRenderPass<'w>, ) -> RenderCommandResult; ``` --- Methods on `QueryState` that take `&mut self` may now result in conflicting borrows if the query items capture the lifetime of the mutable reference. This affects `get()`, `iter()`, and others. To fix the errors, first call `QueryState::update_archetypes()`, and then replace a call `state.foo(world, param)` with `state.query_manual(world).foo_inner(param)`. Alternately, you may be able to restructure the code to call `state.query(world)` once and then make multiple calls using the `Query`. Before: ```rust let mut state: QueryState<_, _> = ...; let d1 = state.get(world, e1); let d2 = state.get(world, e2); // Error: cannot borrow `state` as mutable more than once at a time println!("{d1:?}"); println!("{d2:?}"); ``` After: ```rust let mut state: QueryState<_, _> = ...; state.update_archetypes(world); let d1 = state.get_manual(world, e1); let d2 = state.get_manual(world, e2); // OR state.update_archetypes(world); let d1 = state.query(world).get_inner(e1); let d2 = state.query(world).get_inner(e2); // OR let query = state.query(world); let d1 = query.get_inner(e1); let d1 = query.get_inner(e2); println!("{d1:?}"); println!("{d2:?}"); ```
137 lines
4.1 KiB
Rust
137 lines
4.1 KiB
Rust
//! Convenience logic for turning components from the main world into extracted
|
|
//! instances in the render world.
|
|
//!
|
|
//! This is essentially the same as the `extract_component` module, but
|
|
//! higher-performance because it avoids the ECS overhead.
|
|
|
|
use core::marker::PhantomData;
|
|
|
|
use bevy_app::{App, Plugin};
|
|
use bevy_derive::{Deref, DerefMut};
|
|
use bevy_ecs::{
|
|
prelude::Entity,
|
|
query::{QueryFilter, QueryItem, ReadOnlyQueryData},
|
|
resource::Resource,
|
|
system::{Query, ResMut},
|
|
};
|
|
|
|
use crate::sync_world::MainEntityHashMap;
|
|
use crate::{prelude::ViewVisibility, Extract, ExtractSchedule, RenderApp};
|
|
|
|
/// Describes how to extract data needed for rendering from a component or
|
|
/// components.
|
|
///
|
|
/// Before rendering, any applicable components will be transferred from the
|
|
/// main world to the render world in the [`ExtractSchedule`] step.
|
|
///
|
|
/// This is essentially the same as
|
|
/// [`ExtractComponent`](crate::extract_component::ExtractComponent), but
|
|
/// higher-performance because it avoids the ECS overhead.
|
|
pub trait ExtractInstance: Send + Sync + Sized + 'static {
|
|
/// ECS [`ReadOnlyQueryData`] to fetch the components to extract.
|
|
type QueryData: ReadOnlyQueryData;
|
|
/// Filters the entities with additional constraints.
|
|
type QueryFilter: QueryFilter;
|
|
|
|
/// Defines how the component is transferred into the "render world".
|
|
fn extract(item: QueryItem<'_, '_, Self::QueryData>) -> Option<Self>;
|
|
}
|
|
|
|
/// This plugin extracts one or more components into the "render world" as
|
|
/// extracted instances.
|
|
///
|
|
/// Therefore it sets up the [`ExtractSchedule`] step for the specified
|
|
/// [`ExtractedInstances`].
|
|
#[derive(Default)]
|
|
pub struct ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
only_extract_visible: bool,
|
|
marker: PhantomData<fn() -> EI>,
|
|
}
|
|
|
|
/// Stores all extract instances of a type in the render world.
|
|
#[derive(Resource, Deref, DerefMut)]
|
|
pub struct ExtractedInstances<EI>(MainEntityHashMap<EI>)
|
|
where
|
|
EI: ExtractInstance;
|
|
|
|
impl<EI> Default for ExtractedInstances<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
fn default() -> Self {
|
|
Self(Default::default())
|
|
}
|
|
}
|
|
|
|
impl<EI> ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
/// Creates a new [`ExtractInstancesPlugin`] that unconditionally extracts to
|
|
/// the render world, whether the entity is visible or not.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
only_extract_visible: false,
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
|
|
/// Creates a new [`ExtractInstancesPlugin`] that extracts to the render world
|
|
/// if and only if the entity it's attached to is visible.
|
|
pub fn extract_visible() -> Self {
|
|
Self {
|
|
only_extract_visible: true,
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<EI> Plugin for ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
fn build(&self, app: &mut App) {
|
|
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
|
|
render_app.init_resource::<ExtractedInstances<EI>>();
|
|
if self.only_extract_visible {
|
|
render_app.add_systems(ExtractSchedule, extract_visible::<EI>);
|
|
} else {
|
|
render_app.add_systems(ExtractSchedule, extract_all::<EI>);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn extract_all<EI>(
|
|
mut extracted_instances: ResMut<ExtractedInstances<EI>>,
|
|
query: Extract<Query<(Entity, EI::QueryData), EI::QueryFilter>>,
|
|
) where
|
|
EI: ExtractInstance,
|
|
{
|
|
extracted_instances.clear();
|
|
for (entity, other) in &query {
|
|
if let Some(extract_instance) = EI::extract(other) {
|
|
extracted_instances.insert(entity.into(), extract_instance);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn extract_visible<EI>(
|
|
mut extracted_instances: ResMut<ExtractedInstances<EI>>,
|
|
query: Extract<Query<(Entity, &ViewVisibility, EI::QueryData), EI::QueryFilter>>,
|
|
) where
|
|
EI: ExtractInstance,
|
|
{
|
|
extracted_instances.clear();
|
|
for (entity, view_visibility, other) in &query {
|
|
if view_visibility.get() {
|
|
if let Some(extract_instance) = EI::extract(other) {
|
|
extracted_instances.insert(entity.into(), extract_instance);
|
|
}
|
|
}
|
|
}
|
|
}
|