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

Add brickmaps to the cache sequentially

This commit is contained in:
Jarrod Doyle 2023-05-04 10:51:47 +01:00
parent 5f0ea3fa03
commit 53ccebf4a6
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/voxel/brickmap.rs
View File

@ -24,6 +24,7 @@ pub struct BrickmapManager {
brickgrid: Vec<u32>, brickgrid: Vec<u32>,
brickgrid_buffer: wgpu::Buffer, brickgrid_buffer: wgpu::Buffer,
brickmap_cache: Vec<Brickmap>, brickmap_cache: Vec<Brickmap>,
brickmap_cache_idx: usize,
brickmap_buffer: wgpu::Buffer, brickmap_buffer: wgpu::Buffer,
shading_table: Vec<u32>, shading_table: Vec<u32>,
shading_table_buffer: wgpu::Buffer, shading_table_buffer: wgpu::Buffer,
@ -92,6 +93,7 @@ impl BrickmapManager {
brickgrid, brickgrid,
brickgrid_buffer, brickgrid_buffer,
brickmap_cache, brickmap_cache,
brickmap_cache_idx: 0,
brickmap_buffer, brickmap_buffer,
shading_table, shading_table,
shading_table_buffer, shading_table_buffer,
@ -143,7 +145,7 @@ impl BrickmapManager {
&self.feedback_result_buffer &self.feedback_result_buffer
} }
// TODO: this writes the entirety of every buffer. Very slow! // TODO: Implement an upload buffer that's unpacked on shader side
pub fn process_feedback_buffer(&mut self, context: &render::Context) { pub fn process_feedback_buffer(&mut self, context: &render::Context) {
// Get request count // Get request count
let mut slice = self.feedback_result_buffer.slice(0..16); let mut slice = self.feedback_result_buffer.slice(0..16);
@ -202,7 +204,7 @@ impl BrickmapManager {
} }
// Update the brickgrid index // Update the brickgrid index
let brickgrid_element = ((chunk_idx as u32) << 8) + 4; let brickgrid_element = ((self.brickmap_cache_idx as u32) << 8) + 4;
self.update_brickgrid_element(context, chunk_idx, brickgrid_element); self.update_brickgrid_element(context, chunk_idx, brickgrid_element);
// Update the shading table // Update the shading table
@ -218,19 +220,23 @@ impl BrickmapManager {
); );
// Update the brickmap // Update the brickmap
self.brickmap_cache[chunk_idx].bitmask = bitmask_data; self.brickmap_cache[self.brickmap_cache_idx].bitmask = bitmask_data;
self.brickmap_cache[chunk_idx].shading_table_offset = shading_idx as u32; self.brickmap_cache[self.brickmap_cache_idx].shading_table_offset =
shading_idx as u32;
context.queue.write_buffer( context.queue.write_buffer(
&self.brickmap_buffer, &self.brickmap_buffer,
(72 * chunk_idx) as u64, (72 * self.brickmap_cache_idx) as u64,
bytemuck::cast_slice(&[self.brickmap_cache[chunk_idx]]), bytemuck::cast_slice(&[self.brickmap_cache[self.brickmap_cache_idx]]),
); );
self.brickmap_cache_idx += 1;
} }
} }
// Reset the request count on the gpu buffer // Reset the request count on the gpu buffer
let data = &[0, 0, 0, 0]; let data = &[0, 0, 0, 0];
context.queue.write_buffer(&self.feedback_buffer, 4, data); context.queue.write_buffer(&self.feedback_buffer, 4, data);
log::info!("Num loaded brickmaps: {}", self.brickmap_cache_idx);
} }
fn update_brickgrid_element(&mut self, context: &render::Context, index: usize, data: u32) { fn update_brickgrid_element(&mut self, context: &render::Context, index: usize, data: u32) {