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

[wgpu-core] use Fallible for PipelineCache

Browse Source
This commit is contained in:
teoxoy 2024-09-06 22:06:45 +02:00 committed by Teodor Tanasoaia
parent 5bcdd4266e
commit ee3b63a9af
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1228,15 +1228,11 @@ impl Global {
let cache = desc
.cache
.map(|cache| {
hub.pipeline_caches
.get(cache)
.map_err(|_| pipeline::CreateRenderPipelineError::InvalidCache)
})
.map(|cache| hub.pipeline_caches.strict_get(cache).get())
.transpose();
let cache = match cache {
Ok(cache) => cache,
Err(e) => break 'error e,
Err(e) => break 'error e.into(),
};
let vertex = {
@ -1469,15 +1465,11 @@ impl Global {
let cache = desc
.cache
.map(|cache| {
hub.pipeline_caches
.get(cache)
.map_err(|_| pipeline::CreateComputePipelineError::InvalidCache)
})
.map(|cache| hub.pipeline_caches.strict_get(cache).get())
.transpose();
let cache = match cache {
Ok(cache) => cache,
Err(e) => break 'error e,
Err(e) => break 'error e.into(),
};
let module = hub.shader_modules.strict_get(desc.stage.module).get();
@ -1642,7 +1634,7 @@ impl Global {
let cache = unsafe { device.create_pipeline_cache(desc) };
match cache {
Ok(cache) => {
let id = fid.assign(cache);
let id = fid.assign(Fallible::Valid(cache));
api_log!("Device::create_pipeline_cache -> {id:?}");
return (id, None);
}
@ -1650,7 +1642,7 @@ impl Global {
}
};
let id = fid.assign_error();
let id = fid.assign(Fallible::Invalid(Arc::new(desc.label.to_string())));
(id, Some(error))
}
@ -1661,12 +1653,13 @@ impl Global {
let hub = &self.hub;
if let Some(cache) = hub.pipeline_caches.unregister(pipeline_cache_id) {
#[cfg(feature = "trace")]
let _cache = hub.pipeline_caches.strict_unregister(pipeline_cache_id);
#[cfg(feature = "trace")]
if let Ok(cache) = _cache.get() {
if let Some(t) = cache.device.trace.lock().as_mut() {
t.add(trace::Action::DestroyPipelineCache(pipeline_cache_id));
}
drop(cache)
}
}
@ -2069,7 +2062,7 @@ impl Global {
api_log!("PipelineCache::get_data");
let hub = &self.hub;
if let Ok(cache) = hub.pipeline_caches.get(id) {
if let Ok(cache) = hub.pipeline_caches.strict_get(id).get() {
// TODO: Is this check needed?
if !cache.device.is_valid() {
return None;

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

@ -173,7 +173,7 @@ pub struct Hub {
pub(crate) render_bundles: Registry<Arc<RenderBundle>>,
pub(crate) render_pipelines: Registry<Fallible<RenderPipeline>>,
pub(crate) compute_pipelines: Registry<Fallible<ComputePipeline>>,
pub(crate) pipeline_caches: Registry<Arc<PipelineCache>>,
pub(crate) pipeline_caches: Registry<Fallible<PipelineCache>>,
pub(crate) query_sets: Registry<Fallible<QuerySet>>,
pub(crate) buffers: Registry<Fallible<Buffer>>,
pub(crate) staging_buffers: Registry<StagingBuffer>,

4
wgpu-core/src/pipeline.rs
View File

@ -222,8 +222,6 @@ pub struct ResolvedComputePipelineDescriptor<'a> {
pub enum CreateComputePipelineError {
#[error(transparent)]
Device(#[from] DeviceError),
#[error("Cache is invalid")]
InvalidCache,
#[error("Unable to derive an implicit layout")]
Implicit(#[from] ImplicitLayoutError),
#[error("Error matching shader requirements against the pipeline")]
@ -467,8 +465,6 @@ pub enum CreateRenderPipelineError {
ColorAttachment(#[from] ColorAttachmentError),
#[error(transparent)]
Device(#[from] DeviceError),
#[error("Pipeline cache is invalid")]
InvalidCache,
#[error("Unable to derive an implicit layout")]
Implicit(#[from] ImplicitLayoutError),
#[error("Color state [{0}] is invalid")]