alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 01:21:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

mark function that can be used unsafely unsafe

Browse source
This commit is contained in:
Corwin 2023-04-03 01:54:40 +01:00
parent f86bf9c07a
commit 82b68fc335
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
agb/src/display/object/managed.rs
View file

@ -155,7 +155,9 @@ impl OAMManager<'_> {
} }
} }
fn do_work_with_sprite_loader<C, T>(&self, c: C) -> T /// SAFETY:
/// Do not reenter or recurse or otherwise use sprite loader cell during this.
unsafe fn do_work_with_sprite_loader<C, T>(&self, c: C) -> T
where where
C: Fn(&mut StaticSpriteLoader) -> T, C: Fn(&mut StaticSpriteLoader) -> T,
{ {
@ -184,7 +186,10 @@ impl OAMManager<'_> {
// finished OAM interactions // finished OAM interactions
self.object_store.remove_all_in_removal_list(); self.object_store.remove_all_in_removal_list();
self.do_work_with_sprite_loader(StaticSpriteLoader::garbage_collect); // safety: not reentrant
unsafe {
self.do_work_with_sprite_loader(StaticSpriteLoader::garbage_collect);
}
} }
pub fn add_object(&self, sprite: SpriteVram) -> Object<'_> { pub fn add_object(&self, sprite: SpriteVram) -> Object<'_> {
@ -193,7 +198,10 @@ impl OAMManager<'_> {
} }
pub fn get_vram_sprite(&self, sprite: &'static Sprite) -> SpriteVram { pub fn get_vram_sprite(&self, sprite: &'static Sprite) -> SpriteVram {
self.do_work_with_sprite_loader(|sprite_loader| sprite_loader.get_vram_sprite(sprite)) // safety: not reentrant
unsafe {
self.do_work_with_sprite_loader(|sprite_loader| sprite_loader.get_vram_sprite(sprite))
}
} }
pub fn add_object_static_sprite(&self, sprite: &'static Sprite) -> Object<'_> { pub fn add_object_static_sprite(&self, sprite: &'static Sprite) -> Object<'_> {