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 00:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

move Device.set_queue call in create_device_and_queue_from_hal

Browse Source
This commit is contained in:
teoxoy 2024-07-02 17:42:51 +02:00 committed by Teodor Tanasoaia
parent 96255d484f
commit cd9f003477
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wgpu-core/src/device/resource.rs
View File

@ -373,8 +373,8 @@ impl<A: HalApi> Device<A> {
self.queue.get().as_ref()?.upgrade()
}
pub fn set_queue(&self, queue: Arc<Queue<A>>) {
assert!(self.queue.set(Arc::downgrade(&queue)).is_ok());
pub fn set_queue(&self, queue: &Arc<Queue<A>>) {
assert!(self.queue.set(Arc::downgrade(queue)).is_ok());
}
/// Check this device for completed commands.

24
wgpu-core/src/instance.rs
View File

@ -272,13 +272,14 @@ impl<A: HalApi> Adapter<A> {
}
}
#[allow(clippy::type_complexity)]
fn create_device_and_queue_from_hal(
self: &Arc<Self>,
hal_device: OpenDevice<A>,
desc: &DeviceDescriptor,
instance_flags: wgt::InstanceFlags,
trace_path: Option<&std::path::Path>,
) -> Result<(Arc<Device<A>>, Queue<A>), RequestDeviceError> {
) -> Result<(Arc<Device<A>>, Arc<Queue<A>>), RequestDeviceError> {
api_log!("Adapter::create_device");
if let Ok(device) = Device::new(
@ -294,17 +295,20 @@ impl<A: HalApi> Adapter<A> {
device: device.clone(),
raw: Some(hal_device.queue),
};
let queue = Arc::new(queue);
device.set_queue(&queue);
return Ok((device, queue));
}
Err(RequestDeviceError::OutOfMemory)
}
#[allow(clippy::type_complexity)]
fn create_device_and_queue(
self: &Arc<Self>,
desc: &DeviceDescriptor,
instance_flags: wgt::InstanceFlags,
trace_path: Option<&std::path::Path>,
) -> Result<(Arc<Device<A>>, Queue<A>), RequestDeviceError> {
) -> Result<(Arc<Device<A>>, Arc<Queue<A>>), RequestDeviceError> {
// Verify all features were exposed by the adapter
if !self.raw.features.contains(desc.required_features) {
return Err(RequestDeviceError::UnsupportedFeature(
@ -1078,17 +1082,13 @@ impl Global {
Ok((device, queue)) => (device, queue),
Err(e) => break 'error e,
};
let device_id = device_fid.assign(device);
resource_log!("Created Device {:?}", device_id);
let device = hub.devices.get(device_id).unwrap();
let queue = Arc::new(queue);
let queue_id = queue_fid.assign(queue.clone());
let queue_id = queue_fid.assign(queue);
resource_log!("Created Queue {:?}", queue_id);
device.set_queue(queue);
return (device_id, queue_id, None);
};
@ -1130,17 +1130,13 @@ impl Global {
Ok(device) => device,
Err(e) => break 'error e,
};
let device_id = devices_fid.assign(device);
resource_log!("Created Device {:?}", device_id);
let device = hub.devices.get(device_id).unwrap();
let queue = Arc::new(queue);
let queue_id = queues_fid.assign(queue.clone());
let queue_id = queues_fid.assign(queue);
resource_log!("Created Queue {:?}", queue_id);
device.set_queue(queue);
return (device_id, queue_id, None);
};