archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Restore PointerId(...) serialized representation

Browse Source
This commit is contained in:
Andy Leiserson 2025-10-02 17:06:37 -07:00 committed by Teodor Tanasoaia
parent 19e57d3b44
commit 2d699295ce
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wgpu-core/src/id.rs
View File

@ -129,7 +129,10 @@ impl TryFrom<SerialId> for RawId {
#[allow(dead_code)] #[allow(dead_code)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[derive(Debug)] #[derive(Debug)]
pub struct PointerId<T: Marker>(usize, #[serde(skip)] PhantomData<T>); pub enum PointerId<T: Marker> {
// The only variant forces RON to not ignore "Id"
PointerId(usize, #[serde(skip)] PhantomData<T>),
}
impl<T: Marker> Copy for PointerId<T> {} impl<T: Marker> Copy for PointerId<T> {}
@ -141,7 +144,9 @@ impl<T: Marker> Clone for PointerId<T> {
impl<T: Marker> PartialEq for PointerId<T> { impl<T: Marker> PartialEq for PointerId<T> {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
self.0 == other.0 let PointerId::PointerId(this, _) = self;
let PointerId::PointerId(other, _) = other;
this == other
} }
} }
@ -149,7 +154,8 @@ impl<T: Marker> Eq for PointerId<T> {}
impl<T: Marker> Hash for PointerId<T> { impl<T: Marker> Hash for PointerId<T> {
fn hash<H: core::hash::Hasher>(&self, state: &mut H) { fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
self.0.hash(state); let PointerId::PointerId(this, _) = self;
this.hash(state);
} }
} }
@ -161,7 +167,7 @@ impl<T: StorageItem> From<&Arc<T>> for PointerId<T::Marker> {
// Unfortunately, because `Arc::as_ptr` returns a pointer to the // Unfortunately, because `Arc::as_ptr` returns a pointer to the
// contained data, and `Arc` stores reference counts before the data, // contained data, and `Arc` stores reference counts before the data,
// we are adding an offset to the pointer here. // we are adding an offset to the pointer here.
Self(Arc::as_ptr(arc) as usize, PhantomData) PointerId::PointerId(Arc::as_ptr(arc) as usize, PhantomData)
} }
} }