Skip to content

Commit 504ff3e

Browse files
jimblandyErichDonGubler
authored andcommitted
[core] Rename map_buffer to resolve_buffer, etc.
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.
1 parent a9a98d6 commit 504ff3e

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

wgpu-core/src/device/global.rs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -795,14 +795,14 @@ impl Global {
795795
Err(..) => break 'error binding_model::CreateBindGroupError::InvalidLayout,
796796
};
797797

798-
fn map_entry<'a>(
798+
fn resolve_entry<'a>(
799799
e: &BindGroupEntry<'a>,
800800
buffer_storage: &Storage<resource::Buffer>,
801801
sampler_storage: &Storage<resource::Sampler>,
802802
texture_view_storage: &Storage<resource::TextureView>,
803803
) -> Result<ResolvedBindGroupEntry<'a>, binding_model::CreateBindGroupError>
804804
{
805-
let map_buffer = |bb: &BufferBinding| {
805+
let resolve_buffer = |bb: &BufferBinding| {
806806
buffer_storage
807807
.get_owned(bb.buffer_id)
808808
.map(|buffer| ResolvedBufferBinding {
@@ -814,42 +814,45 @@ impl Global {
814814
binding_model::CreateBindGroupError::InvalidBufferId(bb.buffer_id)
815815
})
816816
};
817-
let map_sampler = |id: &id::SamplerId| {
817+
let resolve_sampler = |id: &id::SamplerId| {
818818
sampler_storage
819819
.get_owned(*id)
820820
.map_err(|_| binding_model::CreateBindGroupError::InvalidSamplerId(*id))
821821
};
822-
let map_view = |id: &id::TextureViewId| {
822+
let resolve_view = |id: &id::TextureViewId| {
823823
texture_view_storage
824824
.get_owned(*id)
825825
.map_err(|_| binding_model::CreateBindGroupError::InvalidTextureViewId(*id))
826826
};
827827
let resource = match e.resource {
828828
BindingResource::Buffer(ref buffer) => {
829-
ResolvedBindingResource::Buffer(map_buffer(buffer)?)
829+
ResolvedBindingResource::Buffer(resolve_buffer(buffer)?)
830830
}
831831
BindingResource::BufferArray(ref buffers) => {
832832
let buffers = buffers
833833
.iter()
834-
.map(map_buffer)
834+
.map(resolve_buffer)
835835
.collect::<Result<Vec<_>, _>>()?;
836836
ResolvedBindingResource::BufferArray(Cow::Owned(buffers))
837837
}
838838
BindingResource::Sampler(ref sampler) => {
839-
ResolvedBindingResource::Sampler(map_sampler(sampler)?)
839+
ResolvedBindingResource::Sampler(resolve_sampler(sampler)?)
840840
}
841841
BindingResource::SamplerArray(ref samplers) => {
842842
let samplers = samplers
843843
.iter()
844-
.map(map_sampler)
844+
.map(resolve_sampler)
845845
.collect::<Result<Vec<_>, _>>()?;
846846
ResolvedBindingResource::SamplerArray(Cow::Owned(samplers))
847847
}
848848
BindingResource::TextureView(ref view) => {
849-
ResolvedBindingResource::TextureView(map_view(view)?)
849+
ResolvedBindingResource::TextureView(resolve_view(view)?)
850850
}
851851
BindingResource::TextureViewArray(ref views) => {
852-
let views = views.iter().map(map_view).collect::<Result<Vec<_>, _>>()?;
852+
let views = views
853+
.iter()
854+
.map(resolve_view)
855+
.collect::<Result<Vec<_>, _>>()?;
853856
ResolvedBindingResource::TextureViewArray(Cow::Owned(views))
854857
}
855858
};
@@ -865,7 +868,7 @@ impl Global {
865868
let sampler_guard = hub.samplers.read();
866869
desc.entries
867870
.iter()
868-
.map(|e| map_entry(e, &buffer_guard, &sampler_guard, &texture_view_guard))
871+
.map(|e| resolve_entry(e, &buffer_guard, &sampler_guard, &texture_view_guard))
869872
.collect::<Result<Vec<_>, _>>()
870873
};
871874
let entries = match entries {

0 commit comments

Comments
 (0)