Factor the slab allocator out of the mesh allocator, and make it generic.

crates/bevy_pbr/src/render/mesh.rs

@@ -39,7 +39,7 @@ use bevy_mesh::{
 };
 use bevy_platform::collections::{hash_map::Entry, HashMap};
 use bevy_render::impl_atomic_pod;
-use bevy_render::mesh::allocator::SlabId;
+use bevy_render::mesh::allocator::MeshSlabId;
 use bevy_render::mesh::morph::{
     MorphTargetImage, MorphTargetsResource, RenderMorphTargetAllocator,
 };
@@ -3261,7 +3261,7 @@ pub enum MeshMorphTargetBindGroups {
 
     /// Maps a morph target slab ID that the mesh allocator manages to the bind
     /// groups for morph displacements in that slab.
-    Storage(HashMap<SlabId, MeshMorphTargetStorageBindGroups>),
+    Storage(HashMap<MeshSlabId, MeshMorphTargetStorageBindGroups>),
 }
 
 /// The bind groups associated with a single morph displacements slab.
@@ -3413,7 +3413,7 @@ pub enum MeshMorphBindGroupKey {
     ///
     /// In this case, there's a bind group per morph displacement slab (managed
     /// by the mesh allocator).
-    Storage(SlabId),
+    Storage(MeshSlabId),
 }
 
 /// Creates the per-mesh bind groups for each type of mesh and each phase.
@@ -3688,7 +3688,7 @@ fn prepare_mesh_morph_target_bind_groups_for_phase_using_storage(
     skins_uniform: &SkinUniforms,
     weights_uniform: &MorphUniforms,
     mesh_allocator: &MeshAllocator,
-    morph_target_storage_bind_groups: &mut HashMap<SlabId, MeshMorphTargetStorageBindGroups>,
+    morph_target_storage_bind_groups: &mut HashMap<MeshSlabId, MeshMorphTargetStorageBindGroups>,
 ) {
     let (skin, prev_skin) = (&skins_uniform.current_buffer, &skins_uniform.prev_buffer);
     let weights = weights_uniform

crates/bevy_render/src/diagnostic/mesh_allocator_diagnostic_plugin.rs

@@ -87,5 +87,5 @@ fn measure_allocator(
         .store(allocator.slabs_size(), Ordering::Relaxed);
     measurements
         .allocations
-        .store(allocator.allocations(), Ordering::Relaxed);
+        .store(allocator.index_allocation_count(), Ordering::Relaxed);
 }

crates/bevy_render/src/lib.rs

@@ -57,6 +57,7 @@ pub mod render_phase;
 pub mod render_resource;
 pub mod renderer;
 pub mod settings;
+pub mod slab_allocator;
 pub mod storage;
 pub mod sync_component;
 pub mod sync_world;