reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move Atlas::deallocate after allocate

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2020-02-26 20:50:32 +01:00
parent bb397cc668
commit fc55e3a3df
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wgpu/src/texture/atlas.rs
View File

@ -132,27 +132,6 @@ impl Atlas {
} }
} }
fn deallocate(&mut self, allocation: &Allocation) {
log::info!("Deallocating atlas: {:?}", allocation);
match allocation {
Allocation::Full { layer } => {
self.layers[*layer] = Layer::Empty;
}
Allocation::Partial { layer, region } => {
let layer = &mut self.layers[*layer];
if let Layer::Busy(allocator) = layer {
allocator.deallocate(region);
if allocator.is_empty() {
*layer = Layer::Empty;
}
}
}
}
}
fn allocate(&mut self, width: u32, height: u32) -> Option<Entry> { fn allocate(&mut self, width: u32, height: u32) -> Option<Entry> {
// Allocate one layer if texture fits perfectly // Allocate one layer if texture fits perfectly
if width == SIZE && height == SIZE { if width == SIZE && height == SIZE {
@ -251,6 +230,27 @@ impl Atlas {
None None
} }
fn deallocate(&mut self, allocation: &Allocation) {
log::info!("Deallocating atlas: {:?}", allocation);
match allocation {
Allocation::Full { layer } => {
self.layers[*layer] = Layer::Empty;
}
Allocation::Partial { layer, region } => {
let layer = &mut self.layers[*layer];
if let Layer::Busy(allocator) = layer {
allocator.deallocate(region);
if allocator.is_empty() {
*layer = Layer::Empty;
}
}
}
}
}
fn upload_allocation( fn upload_allocation(
&mut self, &mut self,
buffer: &wgpu::Buffer, buffer: &wgpu::Buffer,