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

Added labels to all relevant WGPU constructs

This commit is contained in:
Jarrod Doyle 2023-07-05 15:34:23 +01:00
parent 8d74443e17
commit de0f845cb6
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/voxel/brickmap.rs
View File

@ -72,7 +72,7 @@ impl BrickmapManager {
..Default::default() ..Default::default()
}; };
let state_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let state_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: Some("Brick World State"),
contents: bytemuck::cast_slice(&[state_uniform]), contents: bytemuck::cast_slice(&[state_uniform]),
usage: wgpu::BufferUsages::UNIFORM, usage: wgpu::BufferUsages::UNIFORM,
}); });
@ -80,7 +80,7 @@ impl BrickmapManager {
let brickgrid = let brickgrid =
vec![1u32; (brickgrid_dims.x * brickgrid_dims.y * brickgrid_dims.z) as usize]; vec![1u32; (brickgrid_dims.x * brickgrid_dims.y * brickgrid_dims.z) as usize];
let brickgrid_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let brickgrid_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: Some("Brickgrid"),
contents: bytemuck::cast_slice(&brickgrid), contents: bytemuck::cast_slice(&brickgrid),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
@ -88,7 +88,7 @@ impl BrickmapManager {
let brickmap_cache = vec![Brickmap::default(); usize::pow(32, 3)]; let brickmap_cache = vec![Brickmap::default(); usize::pow(32, 3)];
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: None, label: Some("Brickmap Cache"),
contents: bytemuck::cast_slice(&brickmap_cache), contents: bytemuck::cast_slice(&brickmap_cache),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
@ -96,7 +96,7 @@ impl BrickmapManager {
let shading_table_allocator = ShadingTableAllocator::new(4, u32::pow(2, 24)); let shading_table_allocator = ShadingTableAllocator::new(4, u32::pow(2, 24));
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: None, label: Some("Shading Table"),
contents: bytemuck::cast_slice(&shading_table), contents: bytemuck::cast_slice(&shading_table),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
@ -104,14 +104,14 @@ impl BrickmapManager {
let mut arr = [0u32; 1028]; let mut arr = [0u32; 1028];
arr[0] = 256; arr[0] = 256;
let feedback_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let feedback_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: Some("Feedback"),
contents: bytemuck::cast_slice(&arr), contents: bytemuck::cast_slice(&arr),
usage: wgpu::BufferUsages::STORAGE usage: wgpu::BufferUsages::STORAGE
| wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::COPY_DST
| wgpu::BufferUsages::COPY_SRC, | wgpu::BufferUsages::COPY_SRC,
}); });
let feedback_result_buffer = device.create_buffer(&wgpu::BufferDescriptor { let feedback_result_buffer = device.create_buffer(&wgpu::BufferDescriptor {
label: None, label: Some("Feedback Read"),
size: 1028 * 4, size: 1028 * 4,
usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ, usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
mapped_at_creation: false, mapped_at_creation: false,
@ -123,7 +123,7 @@ impl BrickmapManager {
let brickgrid_staged = HashSet::new(); let brickgrid_staged = HashSet::new();
let brickgrid_unpack_buffer = let brickgrid_unpack_buffer =
device.create_buffer_init(&wgpu::util::BufferInitDescriptor { device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: Some("Brickgrid Unpack"),
contents: bytemuck::cast_slice(&arr), contents: bytemuck::cast_slice(&arr),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });
@ -132,7 +132,7 @@ impl BrickmapManager {
arr[0] = unpack_max_count as u32; arr[0] = unpack_max_count as u32;
let brickmap_staged = Vec::new(); let brickmap_staged = Vec::new();
let brickmap_unpack_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let brickmap_unpack_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: None, label: Some("Brickmap Unpack"),
contents: bytemuck::cast_slice(&arr), contents: bytemuck::cast_slice(&arr),
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST, usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
}); });

14
src/voxel/voxel_renderer.rs
View File

@ -37,7 +37,7 @@ impl VoxelRenderer {
context context
.device .device
.create_render_pipeline(&wgpu::RenderPipelineDescriptor { .create_render_pipeline(&wgpu::RenderPipelineDescriptor {
label: None, label: Some("Raycast Quad"),
layout: Some(&context.device.create_pipeline_layout( layout: Some(&context.device.create_pipeline_layout(
&wgpu::PipelineLayoutDescriptor { &wgpu::PipelineLayoutDescriptor {
label: Some("draw"), label: Some("draw"),
@ -69,6 +69,7 @@ impl VoxelRenderer {
let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/brickmap_upload.wgsl"); let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/brickmap_upload.wgsl");
let cs = context.device.create_shader_module(cs_descriptor); let cs = context.device.create_shader_module(cs_descriptor);
let unpack_layout = render::BindGroupLayoutBuilder::new() let unpack_layout = render::BindGroupLayoutBuilder::new()
.with_label("GPU Unpack BGL")
.with_uniform_entry(wgpu::ShaderStages::COMPUTE) .with_uniform_entry(wgpu::ShaderStages::COMPUTE)
.with_rw_storage_entry(wgpu::ShaderStages::COMPUTE) .with_rw_storage_entry(wgpu::ShaderStages::COMPUTE)
.with_rw_storage_entry(wgpu::ShaderStages::COMPUTE) .with_rw_storage_entry(wgpu::ShaderStages::COMPUTE)
@ -77,6 +78,7 @@ impl VoxelRenderer {
.with_ro_storage_entry(wgpu::ShaderStages::COMPUTE) .with_ro_storage_entry(wgpu::ShaderStages::COMPUTE)
.build(context); .build(context);
let unpack_bind_group = render::BindGroupBuilder::new() let unpack_bind_group = render::BindGroupBuilder::new()
.with_label("GPU Unpack BG")
.with_layout(&unpack_layout) .with_layout(&unpack_layout)
.with_entry(brickmap_manager.get_worldstate_buffer().as_entire_binding()) .with_entry(brickmap_manager.get_worldstate_buffer().as_entire_binding())
.with_entry(brickmap_manager.get_brickgrid_buffer().as_entire_binding()) .with_entry(brickmap_manager.get_brickgrid_buffer().as_entire_binding())
@ -97,10 +99,10 @@ impl VoxelRenderer {
context context
.device .device
.create_compute_pipeline(&wgpu::ComputePipelineDescriptor { .create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
label: None, label: Some("GPU Unpack Pipeline"),
layout: Some(&context.device.create_pipeline_layout( layout: Some(&context.device.create_pipeline_layout(
&wgpu::PipelineLayoutDescriptor { &wgpu::PipelineLayoutDescriptor {
label: Some("compute"), label: Some("GPU Unpack PL"),
bind_group_layouts: &[&unpack_layout], bind_group_layouts: &[&unpack_layout],
push_constant_ranges: &[], push_constant_ranges: &[],
}, },
@ -112,6 +114,7 @@ impl VoxelRenderer {
let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/voxel_volume.wgsl"); let cs_descriptor = wgpu::include_wgsl!("../../assets/shaders/voxel_volume.wgsl");
let cs = context.device.create_shader_module(cs_descriptor); let cs = context.device.create_shader_module(cs_descriptor);
let raycast_layout = render::BindGroupLayoutBuilder::new() let raycast_layout = render::BindGroupLayoutBuilder::new()
.with_label("Voxel Raycast BGL")
.with_entry( .with_entry(
wgpu::ShaderStages::COMPUTE, wgpu::ShaderStages::COMPUTE,
wgpu::BindingType::StorageTexture { wgpu::BindingType::StorageTexture {
@ -129,6 +132,7 @@ impl VoxelRenderer {
.with_uniform_entry(wgpu::ShaderStages::COMPUTE) .with_uniform_entry(wgpu::ShaderStages::COMPUTE)
.build(context); .build(context);
let raycast_bind_group = render::BindGroupBuilder::new() let raycast_bind_group = render::BindGroupBuilder::new()
.with_label("Voxel Raycast BG")
.with_layout(&raycast_layout) .with_layout(&raycast_layout)
.with_entry(wgpu::BindingResource::TextureView(&render_texture.view)) .with_entry(wgpu::BindingResource::TextureView(&render_texture.view))
.with_entry(brickmap_manager.get_worldstate_buffer().as_entire_binding()) .with_entry(brickmap_manager.get_worldstate_buffer().as_entire_binding())
@ -142,10 +146,10 @@ impl VoxelRenderer {
context context
.device .device
.create_compute_pipeline(&wgpu::ComputePipelineDescriptor { .create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
label: None, label: Some("Voxel Raycast Pipeline"),
layout: Some(&context.device.create_pipeline_layout( layout: Some(&context.device.create_pipeline_layout(
&wgpu::PipelineLayoutDescriptor { &wgpu::PipelineLayoutDescriptor {
label: Some("compute"), label: Some("Voxel Raycast PL"),
bind_group_layouts: &[&raycast_layout], bind_group_layouts: &[&raycast_layout],
push_constant_ranges: &[], push_constant_ranges: &[],
}, },