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

Make brickmap cache and shading table bucket sizes parameterised

This commit is contained in:
Jarrod Doyle 2023-07-27 18:59:46 +01:00
parent de0f845cb6
commit 1cdabc0854
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/voxel/brickmap.rs
View File

@ -64,7 +64,12 @@ pub struct BrickmapManager {
// TODO: // TODO:
// - Brickworld system // - Brickworld system
impl BrickmapManager { impl BrickmapManager {
pub fn new(context: &render::Context, brickgrid_dims: glam::UVec3) -> Self { pub fn new(
context: &render::Context,
brickgrid_dims: glam::UVec3,
brickmap_cache_size: usize,
shading_table_bucket_size: u32,
) -> Self {
let device = &context.device; let device = &context.device;
let state_uniform = WorldState { let state_uniform = WorldState {
@ -85,7 +90,7 @@ impl BrickmapManager {
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
let brickmap_cache = vec![Brickmap::default(); usize::pow(32, 3)]; let brickmap_cache = vec![Brickmap::default(); brickmap_cache_size];
let brickmap_cache_map = vec![None; brickmap_cache.capacity()]; let brickmap_cache_map = vec![None; brickmap_cache.capacity()];
let brickmap_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let brickmap_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Brickmap Cache"), label: Some("Brickmap Cache"),
@ -93,7 +98,7 @@ impl BrickmapManager {
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
let shading_table_allocator = ShadingTableAllocator::new(4, u32::pow(2, 24)); let shading_table_allocator = ShadingTableAllocator::new(4, shading_table_bucket_size);
let shading_table = vec![0u32; shading_table_allocator.total_elements as usize]; let shading_table = vec![0u32; shading_table_allocator.total_elements as usize];
let shading_table_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let shading_table_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Shading Table"), label: Some("Shading Table"),

7
src/voxel/voxel_renderer.rs
View File

@ -63,7 +63,12 @@ impl VoxelRenderer {
log::info!("Creating brickmap manager..."); log::info!("Creating brickmap manager...");
let brickgrid_dims = glam::uvec3(64, 64, 64); let brickgrid_dims = glam::uvec3(64, 64, 64);
let brickmap_manager = super::brickmap::BrickmapManager::new(context, brickgrid_dims); let brickmap_manager = super::brickmap::BrickmapManager::new(
context,
brickgrid_dims,
usize::pow(32, 3),
u32::pow(2, 24),
);
log::info!("Creating compute pipelines..."); log::info!("Creating compute pipelines...");
let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/brickmap_upload.wgsl"); let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/brickmap_upload.wgsl");