diff --git a/src/gfx_apis/vulkan.rs b/src/gfx_apis/vulkan.rs index 8b1cae35..49f3dac0 100644 --- a/src/gfx_apis/vulkan.rs +++ b/src/gfx_apis/vulkan.rs @@ -14,7 +14,6 @@ mod semaphore; mod shaders; mod shm_image; mod staging; -mod util; use { crate::{ diff --git a/src/gfx_apis/vulkan/bo_allocator.rs b/src/gfx_apis/vulkan/bo_allocator.rs index 1874c72f..f89da55b 100644 --- a/src/gfx_apis/vulkan/bo_allocator.rs +++ b/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, diff --git a/src/gfx_apis/vulkan/device.rs b/src/gfx_apis/vulkan/device.rs index 8e23fabe..00f3b67b 100644 --- a/src/gfx_apis/vulkan/device.rs +++ b/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, diff --git a/src/gfx_apis/vulkan/image.rs b/src/gfx_apis/vulkan/image.rs index d92ad53a..ee0555a5 100644 --- a/src/gfx_apis/vulkan/image.rs +++ b/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::{ diff --git a/src/gfx_apis/vulkan/instance.rs b/src/gfx_apis/vulkan/instance.rs index aba36851..bb39f3c3 100644 --- a/src/gfx_apis/vulkan/instance.rs +++ b/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}, diff --git a/src/gfx_apis/vulkan/pipeline.rs b/src/gfx_apis/vulkan/pipeline.rs index 037e1692..3d495f39 100644 --- a/src/gfx_apis/vulkan/pipeline.rs +++ b/src/gfx_apis/vulkan/pipeline.rs @@ -1,7 +1,10 @@ use { - crate::gfx_apis::vulkan::{ - descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, shaders::VulkanShader, - util::OnDrop, VulkanError, + crate::{ + gfx_apis::vulkan::{ + descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, shaders::VulkanShader, + VulkanError, + }, + utils::on_drop::OnDrop, }, arrayvec::ArrayVec, ash::{ diff --git a/src/gfx_apis/vulkan/shm_image.rs b/src/gfx_apis/vulkan/shm_image.rs index e272eb87..81f6e568 100644 --- a/src/gfx_apis/vulkan/shm_image.rs +++ b/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, diff --git a/src/gfx_apis/vulkan/staging.rs b/src/gfx_apis/vulkan/staging.rs index 7e205a81..b8ccc2ef 100644 --- a/src/gfx_apis/vulkan/staging.rs +++ b/src/gfx_apis/vulkan/staging.rs @@ -1,9 +1,11 @@ use { - crate::gfx_apis::vulkan::{ - allocator::{VulkanAllocation, VulkanAllocator}, - device::VulkanDevice, - util::OnDrop, - VulkanError, + crate::{ + gfx_apis::vulkan::{ + allocator::{VulkanAllocation, VulkanAllocator}, + device::VulkanDevice, + VulkanError, + }, + utils::on_drop::OnDrop, }, ash::vk::{Buffer, BufferCreateInfo, BufferUsageFlags, MappedMemoryRange}, gpu_alloc::UsageFlags, diff --git a/src/utils.rs b/src/utils.rs index d2afdf17..9aed5327 100644 --- a/src/utils.rs +++ b/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; diff --git a/src/gfx_apis/vulkan/util.rs b/src/utils/on_drop.rs similarity index 100% rename from src/gfx_apis/vulkan/util.rs rename to src/utils/on_drop.rs