Add homegrown IDs for Vulkan objects (#2054)

vulkano/src/buffer/sys.rs

@@ -34,6 +34,7 @@ use std::{
     fmt::{Display, Error as FmtError, Formatter},
     hash::{Hash, Hasher},
     mem::{size_of_val, MaybeUninit},
+    num::NonZeroU64,
     ops::{Deref, DerefMut, Range},
     ptr,
     sync::Arc,
@@ -48,6 +49,7 @@ use std::{
 pub struct RawBuffer {
     handle: ash::vk::Buffer,
     device: Arc<Device>,
+    id: NonZeroU64,
 
     flags: BufferCreateFlags,
     size: DeviceSize,
@@ -324,13 +326,12 @@ impl RawBuffer {
         RawBuffer {
             handle,
             device,
-
+            id: Self::next_id(),
             flags,
             size,
             usage,
             sharing,
             external_memory_handle_types,
-
             memory_requirements,
         }
     }
@@ -629,21 +630,7 @@ unsafe impl DeviceOwned for RawBuffer {
     }
 }
 
-impl PartialEq for RawBuffer {
-    #[inline]
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device == other.device
-    }
-}
-
-impl Eq for RawBuffer {}
-
-impl Hash for RawBuffer {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device.hash(state);
-    }
-}
+crate::impl_id_counter!(RawBuffer);
 
 /// Parameters to create a new `Buffer`.
 #[derive(Clone, Debug)]

vulkano/src/buffer/view.rs

@@ -59,6 +59,7 @@ use std::{
     fmt::{Display, Error as FmtError, Formatter},
     hash::{Hash, Hasher},
     mem::MaybeUninit,
+    num::NonZeroU64,
     ops::Range,
     ptr,
     sync::Arc,
@@ -73,6 +74,7 @@ where
 {
     handle: ash::vk::BufferView,
     buffer: Arc<B>,
+    id: NonZeroU64,
 
     format: Option<Format>,
     format_features: FormatFeatures,
@@ -233,7 +235,7 @@ where
         Ok(Arc::new(BufferView {
             handle,
             buffer,
-
+            id: Self::next_id(),
             format: Some(format),
             format_features,
             range: 0..size,
@@ -282,26 +284,7 @@ where
     }
 }
 
-impl<B> PartialEq for BufferView<B>
-where
-    B: BufferAccess + ?Sized,
-{
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device() == other.device()
-    }
-}
-
-impl<B> Eq for BufferView<B> where B: BufferAccess + ?Sized {}
-
-impl<B> Hash for BufferView<B>
-where
-    B: BufferAccess + ?Sized,
-{
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device().hash(state);
-    }
-}
+crate::impl_id_counter!(BufferView<B: BufferAccess + ?Sized>);
 
 /// Parameters to create a new `BufferView`.
 #[derive(Clone, Debug)]

vulkano/src/command_buffer/pool.rs

@@ -17,9 +17,9 @@ use std::{
     cell::Cell,
     error::Error,
     fmt::{Display, Error as FmtError, Formatter},
-    hash::{Hash, Hasher},
     marker::PhantomData,
     mem::MaybeUninit,
+    num::NonZeroU64,
     ptr,
     sync::Arc,
 };
@@ -35,6 +35,7 @@ use std::{
 pub struct CommandPool {
     handle: ash::vk::CommandPool,
     device: Arc<Device>,
+    id: NonZeroU64,
 
     queue_family_index: u32,
     _transient: bool,
@@ -62,6 +63,7 @@ impl CommandPool {
         Ok(CommandPool {
             handle,
             device,
+            id: Self::next_id(),
             queue_family_index,
             _transient: transient,
             _reset_command_buffer: reset_command_buffer,
@@ -91,6 +93,7 @@ impl CommandPool {
         CommandPool {
             handle,
             device,
+            id: Self::next_id(),
             queue_family_index,
             _transient: transient,
             _reset_command_buffer: reset_command_buffer,
@@ -231,7 +234,7 @@ impl CommandPool {
         Ok(out.into_iter().map(move |command_buffer| CommandPoolAlloc {
             handle: command_buffer,
             device: device.clone(),
-
+            id: CommandPoolAlloc::next_id(),
             level,
         }))
     }
@@ -336,21 +339,7 @@ unsafe impl DeviceOwned for CommandPool {
     }
 }
 
-impl PartialEq for CommandPool {
-    #[inline]
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device() == other.device()
-    }
-}
-
-impl Eq for CommandPool {}
-
-impl Hash for CommandPool {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device().hash(state);
-    }
-}
+crate::impl_id_counter!(CommandPool);
 
 /// Error that can happen when creating a `CommandPool`.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -468,6 +457,7 @@ impl Default for CommandBufferAllocateInfo {
 pub struct CommandPoolAlloc {
     handle: ash::vk::CommandBuffer,
     device: Arc<Device>,
+    id: NonZeroU64,
     level: CommandBufferLevel,
 }
 
@@ -495,21 +485,7 @@ unsafe impl DeviceOwned for CommandPoolAlloc {
     }
 }
 
-impl PartialEq for CommandPoolAlloc {
-    #[inline]
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device() == other.device()
-    }
-}
-
-impl Eq for CommandPoolAlloc {}
-
-impl Hash for CommandPoolAlloc {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device().hash(state);
-    }
-}
+crate::impl_id_counter!(CommandPoolAlloc);
 
 /// Error that can happen when trimming command pools.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]

vulkano/src/descriptor_set/layout.rs

@@ -23,8 +23,8 @@ use std::{
     collections::BTreeMap,
     error::Error,
     fmt::{Display, Error as FmtError, Formatter},
-    hash::{Hash, Hasher},
     mem::MaybeUninit,
+    num::NonZeroU64,
     ptr,
     sync::Arc,
 };
@@ -34,6 +34,7 @@ use std::{
 pub struct DescriptorSetLayout {
     handle: ash::vk::DescriptorSetLayout,
     device: Arc<Device>,
+    id: NonZeroU64,
 
     bindings: BTreeMap<u32, DescriptorSetLayoutBinding>,
     push_descriptor: bool,
@@ -60,10 +61,9 @@ impl DescriptorSetLayout {
         Ok(Arc::new(DescriptorSetLayout {
             handle,
             device,
-
+            id: Self::next_id(),
             bindings,
             push_descriptor,
-
             descriptor_counts,
         }))
     }
@@ -98,10 +98,9 @@ impl DescriptorSetLayout {
         Arc::new(DescriptorSetLayout {
             handle,
             device,
-
+            id: Self::next_id(),
             bindings,
             push_descriptor,
-
             descriptor_counts,
         })
     }
@@ -453,21 +452,7 @@ unsafe impl DeviceOwned for DescriptorSetLayout {
     }
 }
 
-impl PartialEq for DescriptorSetLayout {
-    #[inline]
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device() == other.device()
-    }
-}
-
-impl Eq for DescriptorSetLayout {}
-
-impl Hash for DescriptorSetLayout {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device().hash(state);
-    }
-}
+crate::impl_id_counter!(DescriptorSetLayout);
 
 /// Error related to descriptor set layout.
 #[derive(Debug, Clone, PartialEq, Eq)]

vulkano/src/descriptor_set/mod.rs

@@ -141,16 +141,15 @@ pub unsafe trait DescriptorSet: DeviceOwned + Send + Sync {
 impl PartialEq for dyn DescriptorSet {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
-        self.inner().handle() == other.inner().handle() && self.device() == other.device()
+        self.inner() == other.inner()
     }
 }
 
 impl Eq for dyn DescriptorSet {}
 
 impl Hash for dyn DescriptorSet {
     fn hash<H: Hasher>(&self, state: &mut H) {
-        self.inner().handle().hash(state);
-        self.device().hash(state);
+        self.inner().hash(state);
     }
 }
 

vulkano/src/descriptor_set/persistent.rs

@@ -133,7 +133,7 @@ where
     P: DescriptorSetAlloc,
 {
     fn eq(&self, other: &Self) -> bool {
-        self.inner().handle() == other.inner().handle() && self.device() == other.device()
+        self.inner() == other.inner()
     }
 }
 
@@ -144,7 +144,6 @@ where
     P: DescriptorSetAlloc,
 {
     fn hash<H: Hasher>(&self, state: &mut H) {
-        self.inner().handle().hash(state);
-        self.device().hash(state);
+        self.inner().hash(state);
     }
 }

vulkano/src/descriptor_set/pool.rs

@@ -21,9 +21,9 @@ use std::{
     cell::Cell,
     error::Error,
     fmt::{Display, Error as FmtError, Formatter},
-    hash::{Hash, Hasher},
     marker::PhantomData,
     mem::MaybeUninit,
+    num::NonZeroU64,
     ptr,
     sync::Arc,
 };
@@ -36,6 +36,7 @@ use std::{
 pub struct DescriptorPool {
     handle: ash::vk::DescriptorPool,
     device: Arc<Device>,
+    id: NonZeroU64,
 
     max_sets: u32,
     pool_sizes: HashMap<DescriptorType, u32>,
@@ -115,6 +116,7 @@ impl DescriptorPool {
         Ok(DescriptorPool {
             handle,
             device,
+            id: Self::next_id(),
             max_sets,
             pool_sizes,
             can_free_descriptor_sets,
@@ -144,6 +146,7 @@ impl DescriptorPool {
         DescriptorPool {
             handle,
             device,
+            id: Self::next_id(),
             max_sets,
             pool_sizes,
             can_free_descriptor_sets,
@@ -343,21 +346,7 @@ unsafe impl DeviceOwned for DescriptorPool {
     }
 }
 
-impl PartialEq for DescriptorPool {
-    #[inline]
-    fn eq(&self, other: &Self) -> bool {
-        self.handle == other.handle && self.device() == other.device()
-    }
-}
-
-impl Eq for DescriptorPool {}
-
-impl Hash for DescriptorPool {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.handle.hash(state);
-        self.device().hash(state);
-    }
-}
+crate::impl_id_counter!(DescriptorPool);
 
 /// Parameters to create a new `UnsafeDescriptorPool`.
 #[derive(Clone, Debug)]