nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 00:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core]: Let Device::create_buffer_binding get limits from self.

Browse Source 
Rather than passing `self.limits` to `Device::create_buffer_binding`
as an argument, let it simply refer to `self.limits` itself.
This commit is contained in:
Jim Blandy 2024-09-02 12:24:22 -07:00 committed by Erich Gubler
parent 9ebc50fc1e
commit de7765bd28
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wgpu-core/src/device/resource.rs
View File

@ -1890,7 +1890,6 @@ impl Device {
dynamic_binding_info: &mut Vec<binding_model::BindGroupDynamicBindingData>, dynamic_binding_info: &mut Vec<binding_model::BindGroupDynamicBindingData>,
late_buffer_binding_sizes: &mut FastHashMap<u32, wgt::BufferSize>, late_buffer_binding_sizes: &mut FastHashMap<u32, wgt::BufferSize>,
used: &mut BindGroupStates, used: &mut BindGroupStates,
limits: &wgt::Limits,
snatch_guard: &'a SnatchGuard<'a>, snatch_guard: &'a SnatchGuard<'a>,
) -> Result<hal::BufferBinding<'a, dyn hal::DynBuffer>, binding_model::CreateBindGroupError> ) -> Result<hal::BufferBinding<'a, dyn hal::DynBuffer>, binding_model::CreateBindGroupError>
{ {
@ -1915,7 +1914,7 @@ impl Device {
wgt::BufferBindingType::Uniform => ( wgt::BufferBindingType::Uniform => (
wgt::BufferUsages::UNIFORM, wgt::BufferUsages::UNIFORM,
hal::BufferUses::UNIFORM, hal::BufferUses::UNIFORM,
limits.max_uniform_buffer_binding_size, self.limits.max_uniform_buffer_binding_size,
), ),
wgt::BufferBindingType::Storage { read_only } => ( wgt::BufferBindingType::Storage { read_only } => (
wgt::BufferUsages::STORAGE, wgt::BufferUsages::STORAGE,
@ -1924,12 +1923,12 @@ impl Device {
} else { } else {
hal::BufferUses::STORAGE_READ_WRITE hal::BufferUses::STORAGE_READ_WRITE
}, },
limits.max_storage_buffer_binding_size, self.limits.max_storage_buffer_binding_size,
), ),
}; };
let (align, align_limit_name) = let (align, align_limit_name) =
binding_model::buffer_binding_type_alignment(limits, binding_ty); binding_model::buffer_binding_type_alignment(&self.limits, binding_ty);
if bb.offset % align as u64 != 0 { if bb.offset % align as u64 != 0 {
return Err(Error::UnalignedBufferOffset( return Err(Error::UnalignedBufferOffset(
bb.offset, bb.offset,
@ -2167,7 +2166,6 @@ impl Device {
&mut dynamic_binding_info, &mut dynamic_binding_info,
&mut late_buffer_binding_sizes, &mut late_buffer_binding_sizes,
&mut used, &mut used,
&self.limits,
&snatch_guard, &snatch_guard,
)?; )?;
@ -2189,7 +2187,6 @@ impl Device {
&mut dynamic_binding_info, &mut dynamic_binding_info,
&mut late_buffer_binding_sizes, &mut late_buffer_binding_sizes,
&mut used, &mut used,
&self.limits,
&snatch_guard, &snatch_guard,
)?; )?;
hal_buffers.push(bb); hal_buffers.push(bb);
@ -3449,10 +3446,7 @@ impl Device {
Ok(cache) Ok(cache)
} }
fn get_texture_format_features( fn get_texture_format_features(&self, format: TextureFormat) -> wgt::TextureFormatFeatures {
&self,
format: TextureFormat,
) -> wgt::TextureFormatFeatures {
// Variant of adapter.get_texture_format_features that takes device features into account // Variant of adapter.get_texture_format_features that takes device features into account
use wgt::TextureFormatFeatureFlags as tfsc; use wgt::TextureFormatFeatureFlags as tfsc;
let mut format_features = self.adapter.get_texture_format_features(format); let mut format_features = self.adapter.get_texture_format_features(format);