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

[wgpu-core] use .strict_get() & .strict_unregister() for queues

Browse Source 
This works because we never assign errors to queues (they are never invalid).
This commit is contained in:
teoxoy 2024-09-05 15:10:35 +02:00 committed by Teodor Tanasoaia
parent aa280ecd44
commit 07c397a1e5
3 changed files with 15 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2304,10 +2304,7 @@ impl Global {
profiling::scope!("Queue::drop");
api_log!("Queue::drop {queue_id:?}");
let hub = &self.hub;
if let Some(queue) = hub.queues.unregister(queue_id) {
drop(queue);
}
self.hub.queues.strict_unregister(queue_id);
}
pub fn buffer_map_async(

57
wgpu-core/src/device/queue.rs
View File

@ -321,15 +321,9 @@ impl PendingWrites {
}
}
#[derive(Clone, Debug, Error)]
#[error("Queue is invalid")]
pub struct InvalidQueue;
#[derive(Clone, Debug, Error)]
#[non_exhaustive]
pub enum QueueWriteError {
#[error("QueueId is invalid")]
InvalidQueueId,
#[error(transparent)]
Queue(#[from] DeviceError),
#[error(transparent)]
@ -343,8 +337,6 @@ pub enum QueueWriteError {
#[derive(Clone, Debug, Error)]
#[non_exhaustive]
pub enum QueueSubmitError {
#[error("QueueId is invalid")]
InvalidQueueId,
#[error(transparent)]
Queue(#[from] DeviceError),
#[error(transparent)]
@ -381,10 +373,7 @@ impl Global {
.get(buffer_id)
.map_err(|_| TransferError::InvalidBufferId(buffer_id))?;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueWriteError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -444,10 +433,7 @@ impl Global {
profiling::scope!("Queue::create_staging_buffer");
let hub = &self.hub;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueWriteError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -471,10 +457,7 @@ impl Global {
profiling::scope!("Queue::write_staging_buffer");
let hub = &self.hub;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueWriteError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -621,10 +604,7 @@ impl Global {
let hub = &self.hub;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueWriteError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -862,10 +842,7 @@ impl Global {
let hub = &self.hub;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueWriteError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -1072,10 +1049,7 @@ impl Global {
let (submit_index, callbacks) = {
let hub = &self.hub;
let queue = hub
.queues
.get(queue_id)
.map_err(|_| QueueSubmitError::InvalidQueueId)?;
let queue = hub.queues.strict_get(queue_id);
let device = &queue.device;
@ -1369,27 +1343,20 @@ impl Global {
Ok(submit_index)
}
pub fn queue_get_timestamp_period(&self, queue_id: QueueId) -> Result<f32, InvalidQueue> {
let hub = &self.hub;
match hub.queues.get(queue_id) {
Ok(queue) => Ok(unsafe { queue.raw().get_timestamp_period() }),
Err(_) => Err(InvalidQueue),
}
pub fn queue_get_timestamp_period(&self, queue_id: QueueId) -> f32 {
let queue = self.hub.queues.strict_get(queue_id);
unsafe { queue.raw().get_timestamp_period() }
}
pub fn queue_on_submitted_work_done(
&self,
queue_id: QueueId,
closure: SubmittedWorkDoneClosure,
) -> Result<(), InvalidQueue> {
) {
api_log!("Queue::on_submitted_work_done {queue_id:?}");
//TODO: flush pending writes
let hub = &self.hub;
match hub.queues.get(queue_id) {
Ok(queue) => queue.device.lock_life().add_work_done_closure(closure),
Err(_) => return Err(InvalidQueue),
}
Ok(())
let queue = self.hub.queues.strict_get(queue_id);
queue.device.lock_life().add_work_done_closure(closure);
}
}

14
wgpu/src/backend/wgpu_core.rs
View File

@ -2069,13 +2069,7 @@ impl crate::Context for ContextWgpuCore {
}
fn queue_get_timestamp_period(&self, queue_data: &Self::QueueData) -> f32 {
let res = self.0.queue_get_timestamp_period(queue_data.id);
match res {
Ok(v) => v,
Err(cause) => {
self.handle_error_fatal(cause, "Queue::get_timestamp_period");
}
}
self.0.queue_get_timestamp_period(queue_data.id)
}
fn queue_on_submitted_work_done(
@ -2084,11 +2078,7 @@ impl crate::Context for ContextWgpuCore {
callback: crate::context::SubmittedWorkDoneCallback,
) {
let closure = wgc::device::queue::SubmittedWorkDoneClosure::from_rust(callback);
let res = self.0.queue_on_submitted_work_done(queue_data.id, closure);
if let Err(cause) = res {
self.handle_error_fatal(cause, "Queue::on_submitted_work_done");
}
self.0.queue_on_submitted_work_done(queue_data.id, closure);
}
fn device_start_capture(&self, device_data: &Self::DeviceData) {