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

[wgpu-core] use Fallible for Sampler

Browse Source
This commit is contained in:
teoxoy 2024-09-06 21:09:24 +02:00 committed by Teodor Tanasoaia
parent 04f17d4197
commit 3ed1abc492
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-core/src/binding_model.rs
View File

@ -81,8 +81,6 @@ pub enum CreateBindGroupError {
Device(#[from] DeviceError),
#[error("Bind group layout is invalid")]
InvalidLayout,
#[error("SamplerId {0:?} is invalid")]
InvalidSamplerId(SamplerId),
#[error(transparent)]
DestroyedResource(#[from] DestroyedResourceError),
#[error(

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

@ -537,13 +537,13 @@ impl Global {
Err(e) => break 'error e,
};
let id = fid.assign(sampler);
let id = fid.assign(Fallible::Valid(sampler));
api_log!("Device::create_sampler -> {id:?}");
return (id, None);
};
let id = fid.assign_error();
let id = fid.assign(Fallible::Invalid(Arc::new(desc.label.to_string())));
(id, Some(error))
}
@ -553,9 +553,11 @@ impl Global {
let hub = &self.hub;
if let Some(_sampler) = hub.samplers.unregister(sampler_id) {
let _sampler = hub.samplers.strict_unregister(sampler_id);
#[cfg(feature = "trace")]
if let Some(t) = _sampler.device.trace.lock().as_mut() {
if let Ok(sampler) = _sampler.get() {
if let Some(t) = sampler.device.trace.lock().as_mut() {
t.add(trace::Action::DestroySampler(sampler_id));
}
}
@ -733,7 +735,7 @@ impl Global {
fn resolve_entry<'a>(
e: &BindGroupEntry<'a>,
buffer_storage: &Storage<Fallible<resource::Buffer>>,
sampler_storage: &Storage<Arc<resource::Sampler>>,
sampler_storage: &Storage<Fallible<resource::Sampler>>,
texture_view_storage: &Storage<Fallible<resource::TextureView>>,
) -> Result<ResolvedBindGroupEntry<'a>, binding_model::CreateBindGroupError>
{
@ -750,8 +752,9 @@ impl Global {
};
let resolve_sampler = |id: &id::SamplerId| {
sampler_storage
.get_owned(*id)
.map_err(|_| binding_model::CreateBindGroupError::InvalidSamplerId(*id))
.strict_get(*id)
.get()
.map_err(binding_model::CreateBindGroupError::from)
};
let resolve_view = |id: &id::TextureViewId| {
texture_view_storage

2
wgpu-core/src/hub.rs
View File

@ -179,7 +179,7 @@ pub struct Hub {
pub(crate) staging_buffers: Registry<Arc<StagingBuffer>>,
pub(crate) textures: Registry<Fallible<Texture>>,
pub(crate) texture_views: Registry<Fallible<TextureView>>,
pub(crate) samplers: Registry<Arc<Sampler>>,
pub(crate) samplers: Registry<Fallible<Sampler>>,
}
impl Hub {