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

Fix errors due to new dynamic materials API

Browse Source
This commit is contained in:
Lucas Farias 2025-07-02 19:08:34 -03:00
parent cb159ef5b6
commit 156f596502
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/bevy_pbr/src/diagnostic.rs
View File

@ -1,4 +1,7 @@
use core::{any::type_name, marker::PhantomData};
use core::{
any::{type_name, Any, TypeId},
marker::PhantomData,
};
use bevy_app::{Plugin, PreUpdate};
use bevy_diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic};
@ -6,7 +9,7 @@ use bevy_ecs::{resource::Resource, system::Res};
use bevy_platform::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
use bevy_render::{Extract, ExtractSchedule, RenderApp};
use crate::{Material, MaterialBindGroupAllocator};
use crate::{Material, MaterialBindGroupAllocators};
pub struct MaterialAllocatorDiagnosticPlugin<M: Material> {
suffix: &'static str,
@ -103,17 +106,19 @@ fn add_material_allocator_measurement<M: Material>(
);
}
fn measure_allocator<M: Material>(
fn measure_allocator<M: Material + Any>(
measurements: Extract<Res<MaterialAllocatorMeasurements<M>>>,
allocator: Res<MaterialBindGroupAllocator<M>>,
allocators: Res<MaterialBindGroupAllocators>,
) {
measurements
.slabs
.store(allocator.slab_count(), Ordering::Relaxed);
measurements
.slabs_size
.store(allocator.slabs_size(), Ordering::Relaxed);
measurements
.allocations
.store(allocator.allocations(), Ordering::Relaxed);
if let Some(allocator) = allocators.get(&TypeId::of::<M>()) {
measurements
.slabs
.store(allocator.slab_count(), Ordering::Relaxed);
measurements
.slabs_size
.store(allocator.slabs_size(), Ordering::Relaxed);
measurements
.allocations
.store(allocator.allocations(), Ordering::Relaxed);
}
}