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 08:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Rename map_buffer to resolve_buffer, etc.

Browse Source 
In `Device::create_bind_group`, name the functions that convert
resource ids to Arcs `resolve_foo`, not `map_foo`:

- The types that hold Arcs are usually called `ResolvedBlah`.

- The name `map_buffer` is misleading.
This commit is contained in:
Jim Blandy 2024-09-01 17:39:01 -07:00 committed by Erich Gubler
parent a9a98d6056
commit 504ff3e1a6
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wgpu-core/src/device/global.rs
View File

@ -795,14 +795,14 @@ impl Global {
Err(..) => break 'error binding_model::CreateBindGroupError::InvalidLayout, Err(..) => break 'error binding_model::CreateBindGroupError::InvalidLayout,
}; };
fn map_entry<'a>( fn resolve_entry<'a>(
e: &BindGroupEntry<'a>, e: &BindGroupEntry<'a>,
buffer_storage: &Storage<resource::Buffer>, buffer_storage: &Storage<resource::Buffer>,
sampler_storage: &Storage<resource::Sampler>, sampler_storage: &Storage<resource::Sampler>,
texture_view_storage: &Storage<resource::TextureView>, texture_view_storage: &Storage<resource::TextureView>,
) -> Result<ResolvedBindGroupEntry<'a>, binding_model::CreateBindGroupError> ) -> Result<ResolvedBindGroupEntry<'a>, binding_model::CreateBindGroupError>
{ {
let map_buffer = |bb: &BufferBinding| { let resolve_buffer = |bb: &BufferBinding| {
buffer_storage buffer_storage
.get_owned(bb.buffer_id) .get_owned(bb.buffer_id)
.map(|buffer| ResolvedBufferBinding { .map(|buffer| ResolvedBufferBinding {
@ -814,42 +814,45 @@ impl Global {
binding_model::CreateBindGroupError::InvalidBufferId(bb.buffer_id) binding_model::CreateBindGroupError::InvalidBufferId(bb.buffer_id)
}) })
}; };
let map_sampler = |id: &id::SamplerId| { let resolve_sampler = |id: &id::SamplerId| {
sampler_storage sampler_storage
.get_owned(*id) .get_owned(*id)
.map_err(|_| binding_model::CreateBindGroupError::InvalidSamplerId(*id)) .map_err(|_| binding_model::CreateBindGroupError::InvalidSamplerId(*id))
}; };
let map_view = |id: &id::TextureViewId| { let resolve_view = |id: &id::TextureViewId| {
texture_view_storage texture_view_storage
.get_owned(*id) .get_owned(*id)
.map_err(|_| binding_model::CreateBindGroupError::InvalidTextureViewId(*id)) .map_err(|_| binding_model::CreateBindGroupError::InvalidTextureViewId(*id))
}; };
let resource = match e.resource { let resource = match e.resource {
BindingResource::Buffer(ref buffer) => { BindingResource::Buffer(ref buffer) => {
ResolvedBindingResource::Buffer(map_buffer(buffer)?) ResolvedBindingResource::Buffer(resolve_buffer(buffer)?)
} }
BindingResource::BufferArray(ref buffers) => { BindingResource::BufferArray(ref buffers) => {
let buffers = buffers let buffers = buffers
.iter() .iter()
.map(map_buffer) .map(resolve_buffer)
.collect::<Result<Vec<_>, _>>()?; .collect::<Result<Vec<_>, _>>()?;
ResolvedBindingResource::BufferArray(Cow::Owned(buffers)) ResolvedBindingResource::BufferArray(Cow::Owned(buffers))
} }
BindingResource::Sampler(ref sampler) => { BindingResource::Sampler(ref sampler) => {
ResolvedBindingResource::Sampler(map_sampler(sampler)?) ResolvedBindingResource::Sampler(resolve_sampler(sampler)?)
} }
BindingResource::SamplerArray(ref samplers) => { BindingResource::SamplerArray(ref samplers) => {
let samplers = samplers let samplers = samplers
.iter() .iter()
.map(map_sampler) .map(resolve_sampler)
.collect::<Result<Vec<_>, _>>()?; .collect::<Result<Vec<_>, _>>()?;
ResolvedBindingResource::SamplerArray(Cow::Owned(samplers)) ResolvedBindingResource::SamplerArray(Cow::Owned(samplers))
} }
BindingResource::TextureView(ref view) => { BindingResource::TextureView(ref view) => {
ResolvedBindingResource::TextureView(map_view(view)?) ResolvedBindingResource::TextureView(resolve_view(view)?)
} }
BindingResource::TextureViewArray(ref views) => { BindingResource::TextureViewArray(ref views) => {
let views = views.iter().map(map_view).collect::<Result<Vec<_>, _>>()?; let views = views
.iter()
.map(resolve_view)
.collect::<Result<Vec<_>, _>>()?;
ResolvedBindingResource::TextureViewArray(Cow::Owned(views)) ResolvedBindingResource::TextureViewArray(Cow::Owned(views))
} }
}; };
@ -865,7 +868,7 @@ impl Global {
let sampler_guard = hub.samplers.read(); let sampler_guard = hub.samplers.read();
desc.entries desc.entries
.iter() .iter()
.map(|e| map_entry(e, &buffer_guard, &sampler_guard, &texture_view_guard)) .map(|e| resolve_entry(e, &buffer_guard, &sampler_guard, &texture_view_guard))
.collect::<Result<Vec<_>, _>>() .collect::<Result<Vec<_>, _>>()
}; };
let entries = match entries { let entries = match entries {