Jayrude
/
voxel-rs
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed shading table deallocation bug

This commit is contained in:
Jarrod Doyle 2023-06-29 15:24:46 +01:00
parent 9ab84a21c4
commit 5ccebf89cb
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/voxel/brickmap.rs
View File

@ -315,19 +315,21 @@ impl ShadingBucket {
Some(self.global_offset + bucket_index * self.slot_size) Some(self.global_offset + bucket_index * self.slot_size)
} }
fn try_dealloc(&mut self, address: u32) -> Result<(), &str> { fn try_dealloc(&mut self, address: u32) -> Result<(), String> {
log::trace!("Dealloc address: {}", address);
if !self.contains_address(address) { if !self.contains_address(address) {
return Err("Address is not within bucket range."); let msg = format!("Address ({}) is not within bucket range.", address);
return Err(msg);
} }
let local_address = address - self.global_offset; let local_address = address - self.global_offset;
if local_address % self.slot_size != 0 { if local_address % self.slot_size != 0 {
return Err("Address is not aligned to bucket element size."); return Err("Address is not aligned to bucket element size.".to_string());
} }
let bucket_index = local_address / self.slot_size; let bucket_index = local_address / self.slot_size;
if !self.used.contains(&bucket_index) { if !self.used.contains(&bucket_index) {
return Err("Address is not currently allocated."); return Err("Address is not currently allocated.".to_string());
} }
// All the potential errors are out of the way, time to actually deallocate // All the potential errors are out of the way, time to actually deallocate
@ -387,10 +389,11 @@ impl ShadingTableAllocator {
if idx.is_some() { if idx.is_some() {
self.used_elements += bucket.slot_size; self.used_elements += bucket.slot_size;
log::info!( log::info!(
"Allocated to shader table at {}. {}/{}", "Allocated to shader table at {}. {}/{} ({}%)",
idx.unwrap(), idx.unwrap(),
self.used_elements, self.used_elements,
self.total_elements self.total_elements,
((self.used_elements as f32 / self.total_elements as f32) * 100.0).floor()
); );
return idx; return idx;
} }
@ -399,8 +402,10 @@ impl ShadingTableAllocator {
None None
} }
fn try_dealloc(&mut self, address: u32) -> Result<(), &str> { fn try_dealloc(&mut self, address: u32) -> Result<(), String> {
let bucket_idx = address / self.elements_per_bucket; // Buckets are reverse order of their global offset so we need to reverse our idx
let mut bucket_idx = address / self.elements_per_bucket;
bucket_idx = self.bucket_count - bucket_idx - 1;
let bucket = &mut self.buckets[bucket_idx as usize]; let bucket = &mut self.buckets[bucket_idx as usize];
self.used_elements -= bucket.slot_size; self.used_elements -= bucket.slot_size;
bucket.try_dealloc(address) bucket.try_dealloc(address)