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

refactor: s/once_cell::sync::OnceCell/std::sync::OnceLock

Browse Source 
Weaken our dependence on the `once_cell` crate by using functionality
from `std` instead that was upstreamed from `once_cell`.

It's not yet possible to eliminate this dependency entirely, but do what
we can for now.
This commit is contained in:
Erich Gubler 2024-10-10 14:28:42 -04:00 committed by Jim Blandy
parent a13e710956
commit 91447aefc9
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ use crate::{
use arrayvec::ArrayVec;
use once_cell::sync::OnceCell;
#[cfg(feature = "serde")]
use serde::Deserialize;
#[cfg(feature = "serde")]
@ -27,7 +26,7 @@ use std::{
borrow::Cow,
mem::ManuallyDrop,
ops::Range,
sync::{Arc, Weak},
sync::{Arc, OnceLock, Weak},
};
use thiserror::Error;
@ -498,7 +497,7 @@ pub struct BindGroupLayout {
/// We cannot unconditionally remove from the pool, as BGLs that don't come from the pool
/// (derived BGLs) must not be removed.
pub(crate) origin: bgl::Origin,
pub(crate) exclusive_pipeline: OnceCell<ExclusivePipeline>,
pub(crate) exclusive_pipeline: OnceLock<ExclusivePipeline>,
#[allow(unused)]
pub(crate) binding_count_validator: BindingTypeMaxCountValidator,
/// The `label` from the descriptor used to create the resource.

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

@ -35,8 +35,6 @@ use crate::{
};
use arrayvec::ArrayVec;
use once_cell::sync::OnceCell;
use smallvec::SmallVec;
use wgt::{
math::align_to, DeviceLostReason, TextureFormat, TextureSampleType, TextureViewDimension,
@ -48,7 +46,7 @@ use std::{
num::NonZeroU32,
sync::{
atomic::{AtomicBool, AtomicU64, Ordering},
Arc, Weak,
Arc, OnceLock, Weak,
},
};
@ -80,8 +78,8 @@ use super::{
pub struct Device {
raw: ManuallyDrop<Box<dyn hal::DynDevice>>,
pub(crate) adapter: Arc<Adapter>,
pub(crate) queue: OnceCell<Weak<Queue>>,
queue_to_drop: OnceCell<Box<dyn hal::DynQueue>>,
pub(crate) queue: OnceLock<Weak<Queue>>,
queue_to_drop: OnceLock<Box<dyn hal::DynQueue>>,
pub(crate) zero_buffer: ManuallyDrop<Box<dyn hal::DynBuffer>>,
/// The `label` from the descriptor used to create the resource.
label: String,
@ -266,8 +264,8 @@ impl Device {
Ok(Self {
raw: ManuallyDrop::new(raw_device),
adapter: adapter.clone(),
queue: OnceCell::new(),
queue_to_drop: OnceCell::new(),
queue: OnceLock::new(),
queue_to_drop: OnceLock::new(),
zero_buffer: ManuallyDrop::new(zero_buffer),
label: desc.label.to_string(),
command_allocator,
@ -1865,7 +1863,7 @@ impl Device {
device: self.clone(),
entries: entry_map,
origin,
exclusive_pipeline: OnceCell::new(),
exclusive_pipeline: OnceLock::new(),
binding_count_validator: count_validator,
label: label.to_string(),
};