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

Remove unnecessary count parameter in bind layout storage entries

This commit is contained in:
Jarrod Doyle 2023-06-29 11:26:11 +01:00
parent 056c35a441
commit fdd4cbde9c
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/bind_group.rs
View File

@ -55,11 +55,7 @@ impl<'a> BindGroupLayoutBuilder<'a> {
} }
#[inline] #[inline]
pub fn with_rw_storage_entry( pub fn with_rw_storage_entry(self, visibility: wgpu::ShaderStages) -> Self {
self,
visibility: wgpu::ShaderStages,
count: Option<NonZeroU32>,
) -> Self {
self.with_entry( self.with_entry(
visibility, visibility,
wgpu::BindingType::Buffer { wgpu::BindingType::Buffer {
@ -67,16 +63,12 @@ impl<'a> BindGroupLayoutBuilder<'a> {
has_dynamic_offset: false, has_dynamic_offset: false,
min_binding_size: None, min_binding_size: None,
}, },
count, None,
) )
} }
#[inline] #[inline]
pub fn with_ro_storage_entry( pub fn with_ro_storage_entry(self, visibility: wgpu::ShaderStages) -> Self {
self,
visibility: wgpu::ShaderStages,
count: Option<NonZeroU32>,
) -> Self {
self.with_entry( self.with_entry(
visibility, visibility,
wgpu::BindingType::Buffer { wgpu::BindingType::Buffer {
@ -84,7 +76,7 @@ impl<'a> BindGroupLayoutBuilder<'a> {
has_dynamic_offset: false, has_dynamic_offset: false,
min_binding_size: None, min_binding_size: None,
}, },
count, None,
) )
} }

8
src/voxel/voxel_renderer.rs
View File

@ -78,10 +78,10 @@ impl VoxelRenderer {
None, None,
) )
.with_uniform_entry(wgpu::ShaderStages::COMPUTE, None) .with_uniform_entry(wgpu::ShaderStages::COMPUTE, None)
.with_rw_storage_entry(wgpu::ShaderStages::COMPUTE, None) .with_rw_storage_entry(wgpu::ShaderStages::COMPUTE)
.with_ro_storage_entry(wgpu::ShaderStages::COMPUTE, None) .with_ro_storage_entry(wgpu::ShaderStages::COMPUTE)
.with_ro_storage_entry(wgpu::ShaderStages::COMPUTE, None) .with_ro_storage_entry(wgpu::ShaderStages::COMPUTE)
.with_rw_storage_entry(wgpu::ShaderStages::COMPUTE, None) .with_rw_storage_entry(wgpu::ShaderStages::COMPUTE)
.with_uniform_entry(wgpu::ShaderStages::COMPUTE, None) .with_uniform_entry(wgpu::ShaderStages::COMPUTE, None)
.build(context); .build(context);
let raycast_bind_group = render::BindGroupBuilder::new() let raycast_bind_group = render::BindGroupBuilder::new()