forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reallocate materials when they change. (#17979)

Browse Source 
PR #17898 regressed this, causing much of #17970. This commit fixes the
issue by freeing and reallocating materials in the
`MaterialBindGroupAllocator` on change. Note that more efficiency is
possible, but I opted for the simple approach because (1) we should fix
this bug ASAP; (2) I'd like #17965 to land first, because that unlocks
the biggest potential optimization, which is not recreating the bind
group if it isn't necessary to do so.
This commit is contained in:
Patrick Walton 2025-02-22 00:19:43 -08:00 committed by GitHub
parent 465306bc5e
commit ad3817cc1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/bevy_pbr/src/material.rs
View File

@ -29,6 +29,7 @@ use bevy_ecs::{
SystemParamItem, SystemParamItem,
}, },
}; };
use bevy_platform_support::collections::hash_map::Entry;
use bevy_platform_support::collections::{HashMap, HashSet}; use bevy_platform_support::collections::{HashMap, HashSet};
use bevy_platform_support::hash::FixedHasher; use bevy_platform_support::hash::FixedHasher;
use bevy_reflect::std_traits::ReflectDefault; use bevy_reflect::std_traits::ReflectDefault;
@ -1306,12 +1307,24 @@ impl<M: Material> RenderAsset for PreparedMaterial<M> {
false, false,
) { ) {
Ok(unprepared) => { Ok(unprepared) => {
let binding = *render_material_bindings // Allocate or update the material.
.entry(material_id.into()) let binding = match render_material_bindings.entry(material_id.into()) {
.or_insert_with(|| { Entry::Occupied(mut occupied_entry) => {
// TODO: Have a fast path that doesn't require
// recreating the bind group if only buffer contents
// change. For now, we just delete and recreate the bind
// group.
bind_group_allocator.free(*occupied_entry.get());
let new_binding = bind_group_allocator
.allocate_unprepared(unprepared, &pipeline.material_layout);
*occupied_entry.get_mut() = new_binding;
new_binding
}
Entry::Vacant(vacant_entry) => *vacant_entry.insert(
bind_group_allocator bind_group_allocator
.allocate_unprepared(unprepared, &pipeline.material_layout) .allocate_unprepared(unprepared, &pipeline.material_layout),
}); ),
};
Ok(PreparedMaterial { Ok(PreparedMaterial {
binding, binding,