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

Adjust buffer sizes and add todo list

This commit is contained in:
Jarrod Doyle 2023-05-04 16:27:15 +01:00
parent 71d547cd62
commit 12cde87246
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/voxel/brickmap.rs
View File

@ -32,15 +32,21 @@ pub struct BrickmapManager {
feedback_result_buffer: wgpu::Buffer, feedback_result_buffer: wgpu::Buffer,
} }
// TODO:
// - Proper shader table bucket management
// - GPU side unpack buffer rather than uploading each changed brickmap part
// - Cyclic brickmap cache with unloading
// - Brickworld system
// - Move terrain generation to it's own system
impl BrickmapManager { impl BrickmapManager {
pub fn new(context: &render::Context) -> Self { pub fn new(context: &render::Context) -> Self {
let mut state_uniform = WorldState::default(); let mut state_uniform = WorldState::default();
state_uniform.brickmap_cache_dims = [32, 32, 32]; state_uniform.brickmap_cache_dims = [32, 32, 32];
let mut brickmap_cache = Vec::<Brickmap>::with_capacity(32768); let mut brickmap_cache = Vec::<Brickmap>::with_capacity(usize::pow(32, 3));
brickmap_cache.resize(32768, Brickmap::default()); brickmap_cache.resize(brickmap_cache.capacity(), Brickmap::default());
let mut brickgrid = Vec::<u32>::with_capacity(32768); let mut brickgrid = Vec::<u32>::with_capacity(usize::pow(32, 3));
brickgrid.resize(brickgrid.capacity(), 1); brickgrid.resize(brickgrid.capacity(), 1);
let device = &context.device; let device = &context.device;
@ -64,11 +70,11 @@ impl BrickmapManager {
let shading_table_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let shading_table_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: None,
contents: bytemuck::cast_slice(&[0u32; 25000000]), contents: bytemuck::cast_slice(&[0u32; 100000000]),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
let mut shading_table = Vec::<u32>::with_capacity(25000000); let mut shading_table = Vec::<u32>::with_capacity(100000000);
shading_table.resize(shading_table.capacity(), 0); shading_table.resize(shading_table.capacity(), 0);
let mut arr = [0u32; 1028]; let mut arr = [0u32; 1028];
@ -145,7 +151,6 @@ impl BrickmapManager {
&self.feedback_result_buffer &self.feedback_result_buffer
} }
// 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);