Misc clean-up

contrib/rel-mgmt/check

@@ -26,6 +26,7 @@ cargo fmt --manifest-path examples/vr/Cargo.toml && diff || fail "Unformatted ru
 
 # Rust code errors
 cargo check --all-targets
+cargo check --all-targets --features parking_lot
 cargo check --manifest-path contrib/screen-13-egui/Cargo.toml --all-targets --all-features
 cargo check --manifest-path contrib/screen-13-fx/Cargo.toml --all-targets --all-features
 cargo check --manifest-path contrib/screen-13-hot/Cargo.toml --all-targets --all-features
@@ -36,6 +37,7 @@ cargo check --manifest-path examples/vr/Cargo.toml --all-targets --all-features
 
 # Rust code lints
 cargo clippy --all-targets
+cargo clippy --all-targets --features parking_lot
 cargo clippy --manifest-path contrib/screen-13-egui/Cargo.toml --all-targets --all-features
 cargo clippy --manifest-path contrib/screen-13-fx/Cargo.toml --all-targets --all-features
 cargo clippy --manifest-path contrib/screen-13-hot/Cargo.toml --all-targets --all-features

src/driver/accel_struct.rs

@@ -286,8 +286,7 @@ impl AccelerationStructure {
             static TLS: RefCell<Tls> = Default::default();
         }
 
-        TLS.with(|tls| {
-            let mut tls = tls.borrow_mut();
+        TLS.with_borrow_mut(|tls| {
             tls.geometries.clear();
             tls.max_primitive_counts.clear();
 

src/driver/buffer.rs

@@ -12,6 +12,7 @@ use {
     log::warn,
     std::{
         fmt::{Debug, Formatter},
+        mem::ManuallyDrop,
         ops::{Deref, Range},
         sync::{
             atomic::{AtomicU8, Ordering},
@@ -51,7 +52,7 @@ use {
 /// [deref]: core::ops::Deref
 /// [fully qualified syntax]: https://doc.rust-lang.org/book/ch19-03-advanced-traits.html#fully-qualified-syntax-for-disambiguation-calling-methods-with-the-same-name
 pub struct Buffer {
-    allocation: Option<Allocation>,
+    allocation: ManuallyDrop<Allocation>,
     buffer: vk::Buffer,
     device: Arc<Device>,
 
@@ -120,7 +121,7 @@ impl Buffer {
             profiling::scope!("allocate");
 
             #[cfg_attr(not(feature = "parking_lot"), allow(unused_mut))]
-            let mut allocator = device.allocator.as_ref().unwrap().lock();
+            let mut allocator = device.allocator.lock();
 
             #[cfg(not(feature = "parking_lot"))]
             let mut allocator = allocator.unwrap();
@@ -152,7 +153,7 @@ impl Buffer {
         };
 
         Ok(Self {
-            allocation: Some(allocation),
+            allocation: ManuallyDrop::new(allocation),
             buffer,
             device,
             info,
@@ -350,7 +351,7 @@ impl Buffer {
             "Buffer is not mappable - create using mappable flag"
         );
 
-        &this.allocation.as_ref().unwrap().mapped_slice().unwrap()[0..this.info.size as usize]
+        &this.allocation.mapped_slice().unwrap()[0..this.info.size as usize]
     }
 
     /// Returns a mapped mutable slice.
@@ -388,12 +389,7 @@ impl Buffer {
             "Buffer is not mappable - create using mappable flag"
         );
 
-        &mut this
-            .allocation
-            .as_mut()
-            .unwrap()
-            .mapped_slice_mut()
-            .unwrap()[0..this.info.size as usize]
+        &mut this.allocation.mapped_slice_mut().unwrap()[0..this.info.size as usize]
     }
 }
 
@@ -426,12 +422,12 @@ impl Drop for Buffer {
             profiling::scope!("deallocate");
 
             #[cfg_attr(not(feature = "parking_lot"), allow(unused_mut))]
-            let mut allocator = self.device.allocator.as_ref().unwrap().lock();
+            let mut allocator = self.device.allocator.lock();
 
             #[cfg(not(feature = "parking_lot"))]
             let mut allocator = allocator.unwrap();
 
-            allocator.free(self.allocation.take().unwrap())
+            allocator.free(unsafe { ManuallyDrop::take(&mut self.allocation) })
         }
         .unwrap_or_else(|_| warn!("Unable to free buffer allocation"));
 

src/driver/device.rs

@@ -16,7 +16,7 @@ use {
         ffi::CStr,
         fmt::{Debug, Formatter},
         iter::{empty, repeat},
-        mem::forget,
+        mem::{forget, ManuallyDrop},
         ops::Deref,
         thread::panicking,
         time::Instant,
@@ -36,7 +36,7 @@ pub type SelectPhysicalDeviceFn = dyn FnOnce(&[PhysicalDevice]) -> usize;
 pub struct Device {
     pub(crate) accel_struct_ext: Option<khr::AccelerationStructure>,
 
-    pub(super) allocator: Option<Mutex<Allocator>>,
+    pub(super) allocator: ManuallyDrop<Mutex<Allocator>>,
 
     device: ash::Device,
 
@@ -310,7 +310,7 @@ impl Device {
 
         Ok(Self {
             accel_struct_ext,
-            allocator: Some(Mutex::new(allocator)),
+            allocator: ManuallyDrop::new(Mutex::new(allocator)),
             device,
             instance,
             physical_device,
@@ -435,20 +435,22 @@ impl Drop for Device {
     fn drop(&mut self) {
         if panicking() {
             // When panicking we don't want the GPU allocator to complain about leaks
-            forget(self.allocator.take().unwrap());
+            unsafe {
+                forget(ManuallyDrop::take(&mut self.allocator));
+            }
 
             return;
         }
 
         // trace!("drop");
 
-        let res = unsafe { self.device.device_wait_idle() };
-
-        if let Err(err) = res {
+        if let Err(err) = unsafe { self.device.device_wait_idle() } {
             warn!("device_wait_idle() failed: {err}");
         }
 
-        self.allocator.take().unwrap();
+        unsafe {
+            ManuallyDrop::drop(&mut self.allocator);
+        }
 
         unsafe {
             self.device.destroy_device(None);

src/driver/image.rs

@@ -128,7 +128,7 @@ impl Image {
             profiling::scope!("allocate");
 
             #[cfg_attr(not(feature = "parking_lot"), allow(unused_mut))]
-            let mut allocator = device.allocator.as_ref().unwrap().lock();
+            let mut allocator = device.allocator.lock();
 
             #[cfg(not(feature = "parking_lot"))]
             let mut allocator = allocator.unwrap();
@@ -264,7 +264,7 @@ impl Image {
             profiling::scope!("deallocate");
 
             #[cfg_attr(not(feature = "parking_lot"), allow(unused_mut))]
-            let mut allocator = this.device.allocator.as_ref().unwrap().lock();
+            let mut allocator = this.device.allocator.lock();
 
             #[cfg(not(feature = "parking_lot"))]
             let mut allocator = allocator.unwrap();