vulkan: move OnDrop out of vulkan module

src/gfx_apis/vulkan.rs

@@ -14,7 +14,6 @@ mod semaphore;
 mod shaders;
 mod shm_image;
 mod staging;
-mod util;
 
 use {
     crate::{

src/gfx_apis/vulkan/bo_allocator.rs

@@ -8,9 +8,9 @@ use {
         gfx_apis::vulkan::{
             allocator::VulkanAllocator, command::VulkanCommandBuffer, device::VulkanDevice,
             format::VulkanFormat, renderer::image_barrier, staging::VulkanStagingBuffer,
-            util::OnDrop, VulkanError,
+            VulkanError,
         },
-        utils::errorfmt::ErrorFmt,
+        utils::{errorfmt::ErrorFmt, on_drop::OnDrop},
         video::{
             dmabuf::{DmaBuf, DmaBufIds, DmaBufPlane, PlaneVec},
             drm::Drm,

src/gfx_apis/vulkan/device.rs

@@ -7,9 +7,9 @@ use {
                 map_extension_properties, ApiVersionDisplay, Extensions, VulkanInstance,
                 API_VERSION,
             },
-            util::OnDrop,
             VulkanError,
         },
+        utils::on_drop::OnDrop,
         video::{
             drm::{sync_obj::SyncObjCtx, Drm},
             gbm::GbmDevice,

src/gfx_apis/vulkan/image.rs

@@ -4,10 +4,10 @@ use {
         gfx_api::{GfxApiOpt, GfxError, GfxFramebuffer, GfxImage, GfxTexture, SyncFile},
         gfx_apis::vulkan::{
             allocator::VulkanAllocation, device::VulkanDevice, format::VulkanModifierLimits,
-            renderer::VulkanRenderer, shm_image::VulkanShmImage, util::OnDrop, VulkanError,
+            renderer::VulkanRenderer, shm_image::VulkanShmImage, VulkanError,
         },
         theme::Color,
-        utils::clonecell::CloneCell,
+        utils::{clonecell::CloneCell, on_drop::OnDrop},
         video::dmabuf::{DmaBuf, PlaneVec},
     },
     ash::vk::{

src/gfx_apis/vulkan/instance.rs

@@ -1,5 +1,8 @@
 use {
-    crate::gfx_apis::vulkan::{util::OnDrop, VulkanError, VULKAN_VALIDATION},
+    crate::{
+        gfx_apis::vulkan::{VulkanError, VULKAN_VALIDATION},
+        utils::on_drop::OnDrop,
+    },
     ahash::{AHashMap, AHashSet},
     ash::{
         ext::{debug_utils, validation_features},

src/gfx_apis/vulkan/pipeline.rs

@@ -1,7 +1,10 @@
 use {
-    crate::gfx_apis::vulkan::{
+    crate::{
-        descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, shaders::VulkanShader,
+        gfx_apis::vulkan::{
-        util::OnDrop, VulkanError,
+            descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, shaders::VulkanShader,
+            VulkanError,
+        },
+        utils::on_drop::OnDrop,
     },
     arrayvec::ArrayVec,
     ash::{

src/gfx_apis/vulkan/shm_image.rs

@@ -9,11 +9,10 @@ use {
             image::{VulkanImage, VulkanImageMemory},
             renderer::{image_barrier, VulkanRenderer},
             staging::VulkanStagingBuffer,
-            util::OnDrop,
             VulkanError,
         },
         rect::Rect,
-        utils::errorfmt::ErrorFmt,
+        utils::{errorfmt::ErrorFmt, on_drop::OnDrop},
     },
     ash::vk::{
         AccessFlags2, BufferImageCopy2, BufferMemoryBarrier2, CommandBufferBeginInfo,

src/gfx_apis/vulkan/staging.rs

@@ -1,9 +1,11 @@
 use {
-    crate::gfx_apis::vulkan::{
+    crate::{
-        allocator::{VulkanAllocation, VulkanAllocator},
+        gfx_apis::vulkan::{
-        device::VulkanDevice,
+            allocator::{VulkanAllocation, VulkanAllocator},
-        util::OnDrop,
+            device::VulkanDevice,
-        VulkanError,
+            VulkanError,
+        },
+        utils::on_drop::OnDrop,
     },
     ash::vk::{Buffer, BufferCreateInfo, BufferUsageFlags, MappedMemoryRange},
     gpu_alloc::UsageFlags,

src/utils.rs

@@ -27,6 +27,7 @@ pub mod nonblock;
 pub mod num_cpus;
 pub mod numcell;
 pub mod on_change;
+pub mod on_drop;
 pub mod once;
 pub mod opaque;
 pub mod opaque_cell;