diff --git a/CHANGELOG_VULKANO.md b/CHANGELOG_VULKANO.md index fad77f8eed..1c764d20bf 100644 --- a/CHANGELOG_VULKANO.md +++ b/CHANGELOG_VULKANO.md @@ -1,6 +1,6 @@ # Unreleased -- Added external memory support for `DeviceLocalBuffer` for `Linux` +- **Breaking** Updated all code to Rust 2018 edition. - Fixed `shader!` generated descriptor set layouts for shader modules with multiple entrypoints. - **Breaking** Prefixed `shader!` generated descriptor set `Layout` structs with the name of the entrypoint the layout belongs to. For shaders generated from GLSL source, this means `Layout` has been renamed to `MainLayout`. - **Breaking** `shader!` will no longer generate descriptor information for variables that are declared but not used in a shader. @@ -16,8 +16,8 @@ - The `ImageViewAccess` trait is renamed to `ImageViewAbstract`, some methods added, removed or renamed. `ImageView` implements this trait. - `UnsafeImageView` no longer holds image usage information, nor does it check for valid usage. - Replaced deprecated `compare_and_swap` with `compare_exchange`. - - Allow `const` usage of features and `BufferUsage` +- Added external memory support for `DeviceLocalBuffer` for `Linux` # Version 0.21.0 (2021-03-05) diff --git a/vk-sys/Cargo.toml b/vk-sys/Cargo.toml index e0997984d4..84aeb5f44c 100644 --- a/vk-sys/Cargo.toml +++ b/vk-sys/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "vk-sys" version = "0.6.0" +edition = "2018" authors = ["Pierre Krieger ", "The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano" description = "Bindings for the Vulkan graphics API" diff --git a/vulkano/Cargo.toml b/vulkano/Cargo.toml index f80b1b83c2..68b15e1650 100644 --- a/vulkano/Cargo.toml +++ b/vulkano/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "vulkano" version = "0.21.0" +edition = "2018" authors = ["Pierre Krieger ", "The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano" description = "Safe wrapper for the Vulkan graphics API" diff --git a/vulkano/src/buffer/cpu_access.rs b/vulkano/src/buffer/cpu_access.rs index 064f26ddb7..57aaa6f967 100644 --- a/vulkano/src/buffer/cpu_access.rs +++ b/vulkano/src/buffer/cpu_access.rs @@ -31,34 +31,34 @@ use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::sys::BufferCreationError; -use buffer::sys::SparseLevel; -use buffer::sys::UnsafeBuffer; -use buffer::traits::BufferAccess; -use buffer::traits::BufferInner; -use buffer::traits::TypedBufferAccess; -use buffer::BufferUsage; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use instance::QueueFamily; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPoolAlloc; -use memory::Content; -use memory::CpuAccess as MemCpuAccess; -use memory::DedicatedAlloc; -use memory::DeviceMemoryAllocError; +use crate::buffer::sys::BufferCreationError; +use crate::buffer::sys::SparseLevel; +use crate::buffer::sys::UnsafeBuffer; +use crate::buffer::traits::BufferAccess; +use crate::buffer::traits::BufferInner; +use crate::buffer::traits::TypedBufferAccess; +use crate::buffer::BufferUsage; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::instance::QueueFamily; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPoolAlloc; +use crate::memory::Content; +use crate::memory::CpuAccess as MemCpuAccess; +use crate::memory::DedicatedAlloc; +use crate::memory::DeviceMemoryAllocError; use parking_lot::RwLock; use parking_lot::RwLockReadGuard; use parking_lot::RwLockWriteGuard; -use sync::AccessError; -use sync::Sharing; +use crate::sync::AccessError; +use crate::sync::Sharing; /// Buffer whose content is accessible by the CPU. /// @@ -653,7 +653,7 @@ impl fmt::Display for WriteLockError { #[cfg(test)] mod tests { - use buffer::{BufferUsage, CpuAccessibleBuffer}; + use crate::buffer::{BufferUsage, CpuAccessibleBuffer}; #[test] fn create_empty_buffer() { diff --git a/vulkano/src/buffer/cpu_pool.rs b/vulkano/src/buffer/cpu_pool.rs index 687a45795f..46abfa6559 100644 --- a/vulkano/src/buffer/cpu_pool.rs +++ b/vulkano/src/buffer/cpu_pool.rs @@ -20,30 +20,30 @@ use std::sync::Arc; use std::sync::Mutex; use std::sync::MutexGuard; -use buffer::sys::BufferCreationError; -use buffer::sys::SparseLevel; -use buffer::sys::UnsafeBuffer; -use buffer::traits::BufferAccess; -use buffer::traits::BufferInner; -use buffer::traits::TypedBufferAccess; -use buffer::BufferUsage; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPool; -use memory::DedicatedAlloc; -use memory::DeviceMemoryAllocError; -use sync::AccessError; -use sync::Sharing; - -use OomError; +use crate::buffer::sys::BufferCreationError; +use crate::buffer::sys::SparseLevel; +use crate::buffer::sys::UnsafeBuffer; +use crate::buffer::traits::BufferAccess; +use crate::buffer::traits::BufferInner; +use crate::buffer::traits::TypedBufferAccess; +use crate::buffer::BufferUsage; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPool; +use crate::memory::DedicatedAlloc; +use crate::memory::DeviceMemoryAllocError; +use crate::sync::AccessError; +use crate::sync::Sharing; + +use crate::OomError; // TODO: Add `CpuBufferPoolSubbuffer::read` to read the content of a subbuffer. // But that's hard to do because we must prevent `increase_gpu_lock` from working while a @@ -876,7 +876,7 @@ where #[cfg(test)] mod tests { - use buffer::CpuBufferPool; + use crate::buffer::CpuBufferPool; use std::mem; #[test] diff --git a/vulkano/src/buffer/device_local.rs b/vulkano/src/buffer/device_local.rs index 94285f8579..8d6eb2a888 100644 --- a/vulkano/src/buffer/device_local.rs +++ b/vulkano/src/buffer/device_local.rs @@ -21,30 +21,30 @@ use std::mem; use std::sync::Arc; use std::sync::Mutex; -use buffer::sys::BufferCreationError; -use buffer::sys::SparseLevel; -use buffer::sys::UnsafeBuffer; -use buffer::traits::BufferAccess; -use buffer::traits::BufferInner; -use buffer::traits::TypedBufferAccess; -use buffer::BufferUsage; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use instance::QueueFamily; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPoolAlloc; -use memory::{DedicatedAlloc, MemoryRequirements}; -use memory::{DeviceMemoryAllocError, ExternalMemoryHandleType}; +use crate::buffer::sys::BufferCreationError; +use crate::buffer::sys::SparseLevel; +use crate::buffer::sys::UnsafeBuffer; +use crate::buffer::traits::BufferAccess; +use crate::buffer::traits::BufferInner; +use crate::buffer::traits::TypedBufferAccess; +use crate::buffer::BufferUsage; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::instance::QueueFamily; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPoolAlloc; +use crate::memory::{DedicatedAlloc, MemoryRequirements}; +use crate::memory::{DeviceMemoryAllocError, ExternalMemoryHandleType}; use std::fs::File; -use sync::AccessError; -use sync::Sharing; +use crate::sync::AccessError; +use crate::sync::Sharing; /// Buffer whose content is in device-local memory. /// diff --git a/vulkano/src/buffer/immutable.rs b/vulkano/src/buffer/immutable.rs index ffd963edd8..5ecd017774 100644 --- a/vulkano/src/buffer/immutable.rs +++ b/vulkano/src/buffer/immutable.rs @@ -27,35 +27,35 @@ use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::sys::BufferCreationError; -use buffer::sys::SparseLevel; -use buffer::sys::UnsafeBuffer; -use buffer::traits::BufferAccess; -use buffer::traits::BufferInner; -use buffer::traits::TypedBufferAccess; -use buffer::BufferUsage; -use buffer::CpuAccessibleBuffer; -use command_buffer::AutoCommandBuffer; -use command_buffer::AutoCommandBufferBuilder; -use command_buffer::CommandBuffer; -use command_buffer::CommandBufferExecFuture; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use instance::QueueFamily; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPoolAlloc; -use memory::DedicatedAlloc; -use memory::DeviceMemoryAllocError; -use sync::AccessError; -use sync::NowFuture; -use sync::Sharing; +use crate::buffer::sys::BufferCreationError; +use crate::buffer::sys::SparseLevel; +use crate::buffer::sys::UnsafeBuffer; +use crate::buffer::traits::BufferAccess; +use crate::buffer::traits::BufferInner; +use crate::buffer::traits::TypedBufferAccess; +use crate::buffer::BufferUsage; +use crate::buffer::CpuAccessibleBuffer; +use crate::command_buffer::AutoCommandBuffer; +use crate::command_buffer::AutoCommandBufferBuilder; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::CommandBufferExecFuture; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::instance::QueueFamily; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPoolAlloc; +use crate::memory::DedicatedAlloc; +use crate::memory::DeviceMemoryAllocError; +use crate::sync::AccessError; +use crate::sync::NowFuture; +use crate::sync::Sharing; /// Buffer that is written once then read for as long as it is alive. // TODO: implement Debug @@ -531,12 +531,12 @@ impl Hash for ImmutableBufferInitialization { #[cfg(test)] mod tests { - use buffer::cpu_access::CpuAccessibleBuffer; - use buffer::immutable::ImmutableBuffer; - use buffer::BufferUsage; - use command_buffer::AutoCommandBufferBuilder; - use command_buffer::CommandBuffer; - use sync::GpuFuture; + use crate::buffer::cpu_access::CpuAccessibleBuffer; + use crate::buffer::immutable::ImmutableBuffer; + use crate::buffer::BufferUsage; + use crate::command_buffer::AutoCommandBufferBuilder; + use crate::command_buffer::CommandBuffer; + use crate::sync::GpuFuture; #[test] fn from_data_working() { diff --git a/vulkano/src/buffer/slice.rs b/vulkano/src/buffer/slice.rs index dbbfe7ce53..c2c8bbd025 100644 --- a/vulkano/src/buffer/slice.rs +++ b/vulkano/src/buffer/slice.rs @@ -15,14 +15,14 @@ use std::mem::MaybeUninit; use std::ops::Range; use std::sync::Arc; -use buffer::traits::BufferAccess; -use buffer::traits::BufferInner; -use buffer::traits::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use sync::AccessError; +use crate::buffer::traits::BufferAccess; +use crate::buffer::traits::BufferInner; +use crate::buffer::traits::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::sync::AccessError; /// A subpart of a buffer. /// diff --git a/vulkano/src/buffer/sys.rs b/vulkano/src/buffer/sys.rs index 7313659e21..c1cad90188 100644 --- a/vulkano/src/buffer/sys.rs +++ b/vulkano/src/buffer/sys.rs @@ -34,19 +34,19 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use buffer::BufferUsage; -use device::Device; -use device::DeviceOwned; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; -use memory::MemoryRequirements; -use sync::Sharing; - -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::buffer::BufferUsage; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; +use crate::memory::MemoryRequirements; +use crate::sync::Sharing; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Data storage in a GPU-accessible location. pub struct UnsafeBuffer { @@ -520,9 +520,9 @@ mod tests { use super::SparseLevel; use super::UnsafeBuffer; - use device::Device; - use device::DeviceOwned; - use sync::Sharing; + use crate::device::Device; + use crate::device::DeviceOwned; + use crate::sync::Sharing; #[test] fn create() { diff --git a/vulkano/src/buffer/traits.rs b/vulkano/src/buffer/traits.rs index 41c40ddc54..f7ad363785 100644 --- a/vulkano/src/buffer/traits.rs +++ b/vulkano/src/buffer/traits.rs @@ -13,15 +13,15 @@ use std::num::NonZeroU64; use std::ops::Range; use std::ptr; -use buffer::sys::{DeviceAddressUsageNotEnabledError, UnsafeBuffer}; -use buffer::BufferSlice; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use memory::Content; -use sync::AccessError; - -use {vk, SafeDeref, VulkanObject}; +use crate::buffer::sys::{DeviceAddressUsageNotEnabledError, UnsafeBuffer}; +use crate::buffer::BufferSlice; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::memory::Content; +use crate::sync::AccessError; + +use crate::{vk, SafeDeref, VulkanObject}; /// Trait for objects that represent a way for the GPU to have access to a buffer or a slice of a /// buffer. diff --git a/vulkano/src/buffer/usage.rs b/vulkano/src/buffer/usage.rs index 8cd904f8de..747301593e 100644 --- a/vulkano/src/buffer/usage.rs +++ b/vulkano/src/buffer/usage.rs @@ -8,7 +8,7 @@ // according to those terms. use std::ops::BitOr; -use vk; +use crate::vk; /// Describes how a buffer is going to be used. This is **not** just an optimization. /// diff --git a/vulkano/src/buffer/view.rs b/vulkano/src/buffer/view.rs index 8f6152a8fe..1aee34eafd 100644 --- a/vulkano/src/buffer/view.rs +++ b/vulkano/src/buffer/view.rs @@ -43,20 +43,20 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::BufferInner; -use buffer::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use format::FormatDesc; -use format::StrongStorage; - -use check_errors; -use vk; -use Error; -use OomError; -use SafeDeref; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::buffer::BufferInner; +use crate::buffer::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::FormatDesc; +use crate::format::StrongStorage; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SafeDeref; +use crate::VulkanObject; /// Represents a way for the GPU to interpret buffer data. See the documentation of the /// `view` module. @@ -366,11 +366,11 @@ impl From for BufferViewCreationError { #[cfg(test)] mod tests { - use buffer::immutable::ImmutableBuffer; - use buffer::view::BufferViewCreationError; - use buffer::BufferUsage; - use buffer::BufferView; - use format; + use crate::buffer::immutable::ImmutableBuffer; + use crate::buffer::view::BufferViewCreationError; + use crate::buffer::BufferUsage; + use crate::buffer::BufferView; + use crate::format; #[test] fn create_uniform() { diff --git a/vulkano/src/command_buffer/auto.rs b/vulkano/src/command_buffer/auto.rs index ee576cb3d2..9a18e44e31 100644 --- a/vulkano/src/command_buffer/auto.rs +++ b/vulkano/src/command_buffer/auto.rs @@ -16,69 +16,69 @@ use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use command_buffer::pool::standard::StandardCommandPoolAlloc; -use command_buffer::pool::standard::StandardCommandPoolBuilder; -use command_buffer::pool::CommandPoolBuilderAlloc; -use command_buffer::synced::SyncCommandBuffer; -use command_buffer::synced::SyncCommandBufferBuilder; -use command_buffer::synced::SyncCommandBufferBuilderError; -use command_buffer::sys::Flags; -use command_buffer::sys::UnsafeCommandBuffer; -use command_buffer::sys::UnsafeCommandBufferBuilderBufferImageCopy; -use command_buffer::sys::UnsafeCommandBufferBuilderColorImageClear; -use command_buffer::sys::UnsafeCommandBufferBuilderImageAspect; -use command_buffer::sys::UnsafeCommandBufferBuilderImageBlit; -use command_buffer::sys::UnsafeCommandBufferBuilderImageCopy; -use command_buffer::validity::*; -use command_buffer::CommandBuffer; -use command_buffer::CommandBufferExecError; -use command_buffer::DrawIndexedIndirectCommand; -use command_buffer::DrawIndirectCommand; -use command_buffer::DynamicState; -use command_buffer::Kind; -use command_buffer::KindOcclusionQuery; -use command_buffer::KindSecondaryRenderPass; -use command_buffer::StateCacher; -use command_buffer::StateCacherOutcome; -use command_buffer::SubpassContents; -use descriptor::descriptor::{DescriptorBufferDesc, DescriptorDescTy}; -use descriptor::descriptor_set::{DescriptorSetDesc, DescriptorSetsCollection}; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use format::AcceptsPixels; -use format::ClearValue; -use format::Format; -use format::FormatTy; -use framebuffer::EmptySinglePassRenderPassDesc; -use framebuffer::Framebuffer; -use framebuffer::FramebufferAbstract; -use framebuffer::LoadOp; -use framebuffer::RenderPass; -use framebuffer::RenderPassAbstract; -use framebuffer::RenderPassCompatible; -use framebuffer::RenderPassDescClearValues; -use framebuffer::Subpass; -use image::ImageAccess; -use image::ImageLayout; -use instance::QueueFamily; -use pipeline::input_assembly::Index; -use pipeline::vertex::VertexSource; -use pipeline::ComputePipelineAbstract; -use pipeline::GraphicsPipelineAbstract; -use query::QueryPipelineStatisticFlags; -use sampler::Filter; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::command_buffer::pool::standard::StandardCommandPoolAlloc; +use crate::command_buffer::pool::standard::StandardCommandPoolBuilder; +use crate::command_buffer::pool::CommandPoolBuilderAlloc; +use crate::command_buffer::synced::SyncCommandBuffer; +use crate::command_buffer::synced::SyncCommandBufferBuilder; +use crate::command_buffer::synced::SyncCommandBufferBuilderError; +use crate::command_buffer::sys::Flags; +use crate::command_buffer::sys::UnsafeCommandBuffer; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderBufferImageCopy; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderColorImageClear; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderImageAspect; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderImageBlit; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderImageCopy; +use crate::command_buffer::validity::*; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::CommandBufferExecError; +use crate::command_buffer::DrawIndexedIndirectCommand; +use crate::command_buffer::DrawIndirectCommand; +use crate::command_buffer::DynamicState; +use crate::command_buffer::Kind; +use crate::command_buffer::KindOcclusionQuery; +use crate::command_buffer::KindSecondaryRenderPass; +use crate::command_buffer::StateCacher; +use crate::command_buffer::StateCacherOutcome; +use crate::command_buffer::SubpassContents; +use crate::descriptor::descriptor::{DescriptorBufferDesc, DescriptorDescTy}; +use crate::descriptor::descriptor_set::{DescriptorSetDesc, DescriptorSetsCollection}; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::format::AcceptsPixels; +use crate::format::ClearValue; +use crate::format::Format; +use crate::format::FormatTy; +use crate::framebuffer::EmptySinglePassRenderPassDesc; +use crate::framebuffer::Framebuffer; +use crate::framebuffer::FramebufferAbstract; +use crate::framebuffer::LoadOp; +use crate::framebuffer::RenderPass; +use crate::framebuffer::RenderPassAbstract; +use crate::framebuffer::RenderPassCompatible; +use crate::framebuffer::RenderPassDescClearValues; +use crate::framebuffer::Subpass; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::instance::QueueFamily; +use crate::pipeline::input_assembly::Index; +use crate::pipeline::vertex::VertexSource; +use crate::pipeline::ComputePipelineAbstract; +use crate::pipeline::GraphicsPipelineAbstract; +use crate::query::QueryPipelineStatisticFlags; +use crate::sampler::Filter; use smallvec::SmallVec; use std::ffi::CStr; -use sync::AccessCheckError; -use sync::AccessFlagBits; -use sync::GpuFuture; -use sync::PipelineStages; -use VulkanObject; -use {OomError, SafeDeref}; +use crate::sync::AccessCheckError; +use crate::sync::AccessFlagBits; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; +use crate::VulkanObject; +use crate::{OomError, SafeDeref}; /// Note that command buffers allocated from the default command pool (`Arc`) /// don't implement the `Send` and `Sync` traits. If you use this pool, then the @@ -2366,7 +2366,7 @@ mod tests { use crate::device::DeviceExtensions; use crate::device::Features; use crate::sync::GpuFuture; - use instance; + use crate::instance; #[test] fn copy_buffer_dimensions() { diff --git a/vulkano/src/command_buffer/mod.rs b/vulkano/src/command_buffer/mod.rs index c4443bceab..f95ff7dafa 100644 --- a/vulkano/src/command_buffer/mod.rs +++ b/vulkano/src/command_buffer/mod.rs @@ -98,10 +98,10 @@ pub use self::traits::CommandBuffer; pub use self::traits::CommandBufferExecError; pub use self::traits::CommandBufferExecFuture; -use framebuffer::{EmptySinglePassRenderPassDesc, Framebuffer, RenderPass, Subpass}; -use pipeline::depth_stencil::DynamicStencilValue; -use pipeline::viewport::{Scissor, Viewport}; -use query::QueryPipelineStatisticFlags; +use crate::framebuffer::{EmptySinglePassRenderPassDesc, Framebuffer, RenderPass, Subpass}; +use crate::pipeline::depth_stencil::DynamicStencilValue; +use crate::pipeline::viewport::{Scissor, Viewport}; +use crate::query::QueryPipelineStatisticFlags; use std::sync::Arc; pub mod pool; diff --git a/vulkano/src/command_buffer/pool/mod.rs b/vulkano/src/command_buffer/pool/mod.rs index 3df4b506c4..07f54d3117 100644 --- a/vulkano/src/command_buffer/pool/mod.rs +++ b/vulkano/src/command_buffer/pool/mod.rs @@ -16,10 +16,10 @@ //! trait. By default vulkano will use the `StandardCommandPool` struct, but you can implement //! this trait yourself by wrapping around the `UnsafeCommandPool` type. -use instance::QueueFamily; +use crate::instance::QueueFamily; -use device::DeviceOwned; -use OomError; +use crate::device::DeviceOwned; +use crate::OomError; pub use self::standard::StandardCommandPool; pub use self::sys::CommandPoolTrimError; diff --git a/vulkano/src/command_buffer/pool/standard.rs b/vulkano/src/command_buffer/pool/standard.rs index 5d4b875efd..70157d5859 100644 --- a/vulkano/src/command_buffer/pool/standard.rs +++ b/vulkano/src/command_buffer/pool/standard.rs @@ -18,17 +18,17 @@ use std::sync::Weak; use std::thread; use std::vec::IntoIter as VecIntoIter; -use command_buffer::pool::CommandPool; -use command_buffer::pool::CommandPoolAlloc; -use command_buffer::pool::CommandPoolBuilderAlloc; -use command_buffer::pool::UnsafeCommandPool; -use command_buffer::pool::UnsafeCommandPoolAlloc; -use instance::QueueFamily; - -use device::Device; -use device::DeviceOwned; -use OomError; -use VulkanObject; +use crate::command_buffer::pool::CommandPool; +use crate::command_buffer::pool::CommandPoolAlloc; +use crate::command_buffer::pool::CommandPoolBuilderAlloc; +use crate::command_buffer::pool::UnsafeCommandPool; +use crate::command_buffer::pool::UnsafeCommandPoolAlloc; +use crate::instance::QueueFamily; + +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::OomError; +use crate::VulkanObject; /// Standard implementation of a command pool. /// @@ -272,12 +272,12 @@ impl Drop for StandardCommandPoolAlloc { #[cfg(test)] mod tests { - use command_buffer::pool::CommandPool; - use command_buffer::pool::CommandPoolBuilderAlloc; - use command_buffer::pool::StandardCommandPool; - use device::Device; + use crate::command_buffer::pool::CommandPool; + use crate::command_buffer::pool::CommandPoolBuilderAlloc; + use crate::command_buffer::pool::StandardCommandPool; + use crate::device::Device; use std::sync::Arc; - use VulkanObject; + use crate::VulkanObject; #[test] fn reuse_command_buffers() { diff --git a/vulkano/src/command_buffer/pool/sys.rs b/vulkano/src/command_buffer/pool/sys.rs index 8771442c05..5058d54700 100644 --- a/vulkano/src/command_buffer/pool/sys.rs +++ b/vulkano/src/command_buffer/pool/sys.rs @@ -16,15 +16,15 @@ use std::ptr; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use instance::QueueFamily; +use crate::instance::QueueFamily; -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Low-level implementation of a command pool. /// @@ -333,8 +333,8 @@ impl From for CommandPoolTrimError { #[cfg(test)] mod tests { - use command_buffer::pool::CommandPoolTrimError; - use command_buffer::pool::UnsafeCommandPool; + use crate::command_buffer::pool::CommandPoolTrimError; + use crate::command_buffer::pool::UnsafeCommandPool; #[test] fn basic_create() { diff --git a/vulkano/src/command_buffer/state_cacher.rs b/vulkano/src/command_buffer/state_cacher.rs index 73ae0ae59e..98b26f8fb8 100644 --- a/vulkano/src/command_buffer/state_cacher.rs +++ b/vulkano/src/command_buffer/state_cacher.rs @@ -7,16 +7,16 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use buffer::BufferAccess; -use command_buffer::DynamicState; -use descriptor::DescriptorSet; -use pipeline::input_assembly::IndexType; -use pipeline::ComputePipelineAbstract; -use pipeline::GraphicsPipelineAbstract; +use crate::buffer::BufferAccess; +use crate::command_buffer::DynamicState; +use crate::descriptor::DescriptorSet; +use crate::pipeline::input_assembly::IndexType; +use crate::pipeline::ComputePipelineAbstract; +use crate::pipeline::GraphicsPipelineAbstract; use smallvec::SmallVec; use std::ops::Range; -use vk; -use VulkanObject; +use crate::vk; +use crate::VulkanObject; /// Keep track of the state of a command buffer builder, so that you don't need to bind objects /// that were already bound. @@ -359,9 +359,9 @@ impl<'s> StateCacherVertexBuffers<'s> { #[cfg(test)] mod tests { - use buffer::BufferUsage; - use buffer::CpuAccessibleBuffer; - use command_buffer::state_cacher::StateCacher; + use crate::buffer::BufferUsage; + use crate::buffer::CpuAccessibleBuffer; + use crate::command_buffer::state_cacher::StateCacher; #[test] fn vb_caching_single() { diff --git a/vulkano/src/command_buffer/submit/bind_sparse.rs b/vulkano/src/command_buffer/submit/bind_sparse.rs index 99e55289f1..ea383250aa 100644 --- a/vulkano/src/command_buffer/submit/bind_sparse.rs +++ b/vulkano/src/command_buffer/submit/bind_sparse.rs @@ -13,19 +13,19 @@ use std::fmt; use std::marker::PhantomData; use std::ptr; -use buffer::sys::UnsafeBuffer; -use device::Queue; -use image::sys::UnsafeImage; -use memory::DeviceMemory; -use sync::Fence; -use sync::Semaphore; - -use check_errors; -use vk; -use Error; -use OomError; -use SynchronizedVulkanObject; -use VulkanObject; +use crate::buffer::sys::UnsafeBuffer; +use crate::device::Queue; +use crate::image::sys::UnsafeImage; +use crate::memory::DeviceMemory; +use crate::sync::Fence; +use crate::sync::Semaphore; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SynchronizedVulkanObject; +use crate::VulkanObject; // TODO: correctly implement Debug on all the structs of this module diff --git a/vulkano/src/command_buffer/submit/queue_present.rs b/vulkano/src/command_buffer/submit/queue_present.rs index 2fc2a518ff..971ea5db1f 100644 --- a/vulkano/src/command_buffer/submit/queue_present.rs +++ b/vulkano/src/command_buffer/submit/queue_present.rs @@ -13,18 +13,18 @@ use std::fmt; use std::marker::PhantomData; use std::ptr; -use device::DeviceOwned; -use device::Queue; -use swapchain::PresentRegion; -use swapchain::Swapchain; -use sync::Semaphore; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::swapchain::PresentRegion; +use crate::swapchain::Swapchain; +use crate::sync::Semaphore; -use check_errors; -use vk; -use Error; -use OomError; -use SynchronizedVulkanObject; -use VulkanObject; +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SynchronizedVulkanObject; +use crate::VulkanObject; /// Prototype for a submission that presents a swapchain on the screen. // TODO: example here diff --git a/vulkano/src/command_buffer/submit/queue_submit.rs b/vulkano/src/command_buffer/submit/queue_submit.rs index 46ea488807..a38d82007a 100644 --- a/vulkano/src/command_buffer/submit/queue_submit.rs +++ b/vulkano/src/command_buffer/submit/queue_submit.rs @@ -13,18 +13,18 @@ use std::fmt; use std::marker::PhantomData; use std::ptr; -use command_buffer::sys::UnsafeCommandBuffer; -use device::Queue; -use sync::Fence; -use sync::PipelineStages; -use sync::Semaphore; - -use check_errors; -use vk; -use Error; -use OomError; -use SynchronizedVulkanObject; -use VulkanObject; +use crate::command_buffer::sys::UnsafeCommandBuffer; +use crate::device::Queue; +use crate::sync::Fence; +use crate::sync::PipelineStages; +use crate::sync::Semaphore; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SynchronizedVulkanObject; +use crate::VulkanObject; /// Prototype for a submission that executes command buffers. // TODO: example here @@ -303,7 +303,7 @@ impl From for SubmitCommandBufferError { mod tests { use super::*; use std::time::Duration; - use sync::Fence; + use crate::sync::Fence; #[test] fn empty_submit() { diff --git a/vulkano/src/command_buffer/submit/semaphores_wait.rs b/vulkano/src/command_buffer/submit/semaphores_wait.rs index 3d13b62ecb..2ebcfed4ea 100644 --- a/vulkano/src/command_buffer/submit/semaphores_wait.rs +++ b/vulkano/src/command_buffer/submit/semaphores_wait.rs @@ -9,10 +9,10 @@ use smallvec::SmallVec; -use command_buffer::submit::SubmitCommandBufferBuilder; -use command_buffer::submit::SubmitPresentBuilder; -use sync::PipelineStages; -use sync::Semaphore; +use crate::command_buffer::submit::SubmitCommandBufferBuilder; +use crate::command_buffer::submit::SubmitPresentBuilder; +use crate::sync::PipelineStages; +use crate::sync::Semaphore; /// Prototype for a submission that waits on semaphores. /// diff --git a/vulkano/src/command_buffer/synced/base.rs b/vulkano/src/command_buffer/synced/base.rs index c68ca1ddd6..934e0c17cf 100644 --- a/vulkano/src/command_buffer/synced/base.rs +++ b/vulkano/src/command_buffer/synced/base.rs @@ -16,30 +16,30 @@ use std::hash::{Hash, Hasher}; use std::sync::Arc; use std::sync::Mutex; -use buffer::BufferAccess; -use command_buffer::pool::CommandPool; -use command_buffer::pool::CommandPoolAlloc; -use command_buffer::pool::CommandPoolBuilderAlloc; -use command_buffer::sys::Flags; -use command_buffer::sys::UnsafeCommandBuffer; -use command_buffer::sys::UnsafeCommandBufferBuilder; -use command_buffer::sys::UnsafeCommandBufferBuilderPipelineBarrier; -use command_buffer::CommandBufferExecError; -use command_buffer::Kind; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use framebuffer::FramebufferAbstract; -use framebuffer::RenderPassAbstract; -use image::ImageAccess; -use image::ImageLayout; +use crate::buffer::BufferAccess; +use crate::command_buffer::pool::CommandPool; +use crate::command_buffer::pool::CommandPoolAlloc; +use crate::command_buffer::pool::CommandPoolBuilderAlloc; +use crate::command_buffer::sys::Flags; +use crate::command_buffer::sys::UnsafeCommandBuffer; +use crate::command_buffer::sys::UnsafeCommandBufferBuilder; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderPipelineBarrier; +use crate::command_buffer::CommandBufferExecError; +use crate::command_buffer::Kind; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::framebuffer::FramebufferAbstract; +use crate::framebuffer::RenderPassAbstract; +use crate::image::ImageAccess; +use crate::image::ImageLayout; use std::cell::RefCell; -use sync::AccessCheckError; -use sync::AccessError; -use sync::AccessFlagBits; -use sync::GpuFuture; -use sync::PipelineStages; -use OomError; +use crate::sync::AccessCheckError; +use crate::sync::AccessError; +use crate::sync::AccessFlagBits; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; +use crate::OomError; /// Wrapper around `UnsafeCommandBufferBuilder` that handles synchronization for you. /// diff --git a/vulkano/src/command_buffer/synced/commands.rs b/vulkano/src/command_buffer/synced/commands.rs index 92e398d0a0..510443c2c3 100644 --- a/vulkano/src/command_buffer/synced/commands.rs +++ b/vulkano/src/command_buffer/synced/commands.rs @@ -14,42 +14,42 @@ use std::mem; use std::ptr; use std::sync::Arc; -use buffer::BufferAccess; -use command_buffer::synced::base::Command; -use command_buffer::synced::base::FinalCommand; -use command_buffer::synced::base::KeyTy; -use command_buffer::synced::base::SyncCommandBufferBuilder; -use command_buffer::synced::base::SyncCommandBufferBuilderError; -use command_buffer::sys::UnsafeCommandBufferBuilder; -use command_buffer::sys::UnsafeCommandBufferBuilderBindVertexBuffer; -use command_buffer::sys::UnsafeCommandBufferBuilderBufferImageCopy; -use command_buffer::sys::UnsafeCommandBufferBuilderColorImageClear; -use command_buffer::sys::UnsafeCommandBufferBuilderExecuteCommands; -use command_buffer::sys::UnsafeCommandBufferBuilderImageBlit; -use command_buffer::sys::UnsafeCommandBufferBuilderImageCopy; -use command_buffer::CommandBuffer; -use command_buffer::SubpassContents; -use descriptor::descriptor::DescriptorDescTy; -use descriptor::descriptor::ShaderStages; -use descriptor::descriptor_set::DescriptorSet; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use format::ClearValue; -use framebuffer::FramebufferAbstract; -use image::ImageAccess; -use image::ImageLayout; -use pipeline::depth_stencil::DynamicStencilValue; -use pipeline::depth_stencil::StencilFaceFlags; -use pipeline::input_assembly::IndexType; -use pipeline::viewport::Scissor; -use pipeline::viewport::Viewport; -use pipeline::ComputePipelineAbstract; -use pipeline::GraphicsPipelineAbstract; -use sampler::Filter; +use crate::buffer::BufferAccess; +use crate::command_buffer::synced::base::Command; +use crate::command_buffer::synced::base::FinalCommand; +use crate::command_buffer::synced::base::KeyTy; +use crate::command_buffer::synced::base::SyncCommandBufferBuilder; +use crate::command_buffer::synced::base::SyncCommandBufferBuilderError; +use crate::command_buffer::sys::UnsafeCommandBufferBuilder; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderBindVertexBuffer; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderBufferImageCopy; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderColorImageClear; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderExecuteCommands; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderImageBlit; +use crate::command_buffer::sys::UnsafeCommandBufferBuilderImageCopy; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::SubpassContents; +use crate::descriptor::descriptor::DescriptorDescTy; +use crate::descriptor::descriptor::ShaderStages; +use crate::descriptor::descriptor_set::DescriptorSet; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::format::ClearValue; +use crate::framebuffer::FramebufferAbstract; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::pipeline::depth_stencil::DynamicStencilValue; +use crate::pipeline::depth_stencil::StencilFaceFlags; +use crate::pipeline::input_assembly::IndexType; +use crate::pipeline::viewport::Scissor; +use crate::pipeline::viewport::Viewport; +use crate::pipeline::ComputePipelineAbstract; +use crate::pipeline::GraphicsPipelineAbstract; +use crate::sampler::Filter; use std::ffi::CStr; -use sync::AccessFlagBits; -use sync::Event; -use sync::PipelineStages; -use SafeDeref; +use crate::sync::AccessFlagBits; +use crate::sync::Event; +use crate::sync::PipelineStages; +use crate::SafeDeref; impl

SyncCommandBufferBuilder

{ /// Calls `vkBeginRenderPass` on the builder. diff --git a/vulkano/src/command_buffer/synced/tests.rs b/vulkano/src/command_buffer/synced/tests.rs index a67fab4424..8d3b9b633e 100644 --- a/vulkano/src/command_buffer/synced/tests.rs +++ b/vulkano/src/command_buffer/synced/tests.rs @@ -9,13 +9,13 @@ use std::iter; -use buffer::BufferUsage; -use buffer::CpuAccessibleBuffer; -use command_buffer::synced::base::SyncCommandBufferBuilder; -use command_buffer::synced::base::SyncCommandBufferBuilderError; -use command_buffer::sys::Flags; -use command_buffer::Kind; -use device::Device; +use crate::buffer::BufferUsage; +use crate::buffer::CpuAccessibleBuffer; +use crate::command_buffer::synced::base::SyncCommandBufferBuilder; +use crate::command_buffer::synced::base::SyncCommandBufferBuilderError; +use crate::command_buffer::sys::Flags; +use crate::command_buffer::Kind; +use crate::device::Device; #[test] fn basic_creation() { diff --git a/vulkano/src/command_buffer/sys.rs b/vulkano/src/command_buffer/sys.rs index cf7120e24f..9147f3264c 100644 --- a/vulkano/src/command_buffer/sys.rs +++ b/vulkano/src/command_buffer/sys.rs @@ -14,45 +14,45 @@ use std::ops::Range; use std::ptr; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::BufferInner; -use check_errors; -use command_buffer::pool::CommandPool; -use command_buffer::pool::CommandPoolAlloc; -use command_buffer::pool::CommandPoolBuilderAlloc; -use command_buffer::CommandBuffer; -use command_buffer::Kind; -use command_buffer::KindOcclusionQuery; -use command_buffer::SubpassContents; -use descriptor::descriptor::ShaderStages; -use descriptor::descriptor_set::UnsafeDescriptorSet; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use device::Device; -use device::DeviceOwned; -use format::ClearValue; -use format::FormatTy; -use format::PossibleCompressedFormatDesc; -use framebuffer::FramebufferAbstract; -use framebuffer::RenderPassAbstract; -use image::ImageAccess; -use image::ImageLayout; -use instance::QueueFamily; -use pipeline::depth_stencil::StencilFaceFlags; -use pipeline::input_assembly::IndexType; -use pipeline::viewport::Scissor; -use pipeline::viewport::Viewport; -use pipeline::ComputePipelineAbstract; -use pipeline::GraphicsPipelineAbstract; -use query::UnsafeQueriesRange; -use query::UnsafeQuery; -use sampler::Filter; +use crate::buffer::BufferAccess; +use crate::buffer::BufferInner; +use crate::check_errors; +use crate::command_buffer::pool::CommandPool; +use crate::command_buffer::pool::CommandPoolAlloc; +use crate::command_buffer::pool::CommandPoolBuilderAlloc; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::Kind; +use crate::command_buffer::KindOcclusionQuery; +use crate::command_buffer::SubpassContents; +use crate::descriptor::descriptor::ShaderStages; +use crate::descriptor::descriptor_set::UnsafeDescriptorSet; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::ClearValue; +use crate::format::FormatTy; +use crate::format::PossibleCompressedFormatDesc; +use crate::framebuffer::FramebufferAbstract; +use crate::framebuffer::RenderPassAbstract; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::instance::QueueFamily; +use crate::pipeline::depth_stencil::StencilFaceFlags; +use crate::pipeline::input_assembly::IndexType; +use crate::pipeline::viewport::Scissor; +use crate::pipeline::viewport::Viewport; +use crate::pipeline::ComputePipelineAbstract; +use crate::pipeline::GraphicsPipelineAbstract; +use crate::query::UnsafeQueriesRange; +use crate::query::UnsafeQuery; +use crate::sampler::Filter; use std::ffi::CStr; -use sync::AccessFlagBits; -use sync::Event; -use sync::PipelineStages; -use vk; -use OomError; -use VulkanObject; +use crate::sync::AccessFlagBits; +use crate::sync::Event; +use crate::sync::PipelineStages; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; /// Flags to pass when creating a command buffer. /// diff --git a/vulkano/src/command_buffer/traits.rs b/vulkano/src/command_buffer/traits.rs index c5ae5b1596..0009ab53a1 100644 --- a/vulkano/src/command_buffer/traits.rs +++ b/vulkano/src/command_buffer/traits.rs @@ -15,27 +15,27 @@ use std::sync::atomic::Ordering; use std::sync::Arc; use std::sync::Mutex; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use command_buffer::submit::SubmitCommandBufferBuilder; -use command_buffer::sys::UnsafeCommandBuffer; -use command_buffer::Kind; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use framebuffer::{FramebufferAbstract, RenderPassAbstract}; -use image::ImageAccess; -use image::ImageLayout; -use sync::now; -use sync::AccessCheckError; -use sync::AccessError; -use sync::AccessFlagBits; -use sync::FlushError; -use sync::GpuFuture; -use sync::NowFuture; -use sync::PipelineStages; -use SafeDeref; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::command_buffer::submit::SubmitCommandBufferBuilder; +use crate::command_buffer::sys::UnsafeCommandBuffer; +use crate::command_buffer::Kind; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::framebuffer::{FramebufferAbstract, RenderPassAbstract}; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::sync::now; +use crate::sync::AccessCheckError; +use crate::sync::AccessError; +use crate::sync::AccessFlagBits; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::NowFuture; +use crate::sync::PipelineStages; +use crate::SafeDeref; +use crate::VulkanObject; pub unsafe trait CommandBuffer: DeviceOwned { /// The command pool of the command buffer. diff --git a/vulkano/src/command_buffer/validity/blit_image.rs b/vulkano/src/command_buffer/validity/blit_image.rs index 92e5a6f260..b6cea694ce 100644 --- a/vulkano/src/command_buffer/validity/blit_image.rs +++ b/vulkano/src/command_buffer/validity/blit_image.rs @@ -10,12 +10,12 @@ use std::error; use std::fmt; -use device::Device; -use format::FormatTy; -use image::ImageAccess; -use image::ImageDimensions; -use sampler::Filter; -use VulkanObject; +use crate::device::Device; +use crate::format::FormatTy; +use crate::image::ImageAccess; +use crate::image::ImageDimensions; +use crate::sampler::Filter; +use crate::VulkanObject; /// Checks whether a blit image command is valid. /// diff --git a/vulkano/src/command_buffer/validity/clear_color_image.rs b/vulkano/src/command_buffer/validity/clear_color_image.rs index 13acfe58f4..6ecb68f94d 100644 --- a/vulkano/src/command_buffer/validity/clear_color_image.rs +++ b/vulkano/src/command_buffer/validity/clear_color_image.rs @@ -10,9 +10,9 @@ use std::error; use std::fmt; -use device::Device; -use image::ImageAccess; -use VulkanObject; +use crate::device::Device; +use crate::image::ImageAccess; +use crate::VulkanObject; /// Checks whether a clear color image command is valid. /// diff --git a/vulkano/src/command_buffer/validity/copy_buffer.rs b/vulkano/src/command_buffer/validity/copy_buffer.rs index 0f28fd27df..59f9f02d93 100644 --- a/vulkano/src/command_buffer/validity/copy_buffer.rs +++ b/vulkano/src/command_buffer/validity/copy_buffer.rs @@ -11,10 +11,10 @@ use std::cmp; use std::error; use std::fmt; -use buffer::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use VulkanObject; +use crate::buffer::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::VulkanObject; /// Checks whether a copy buffer command is valid. /// diff --git a/vulkano/src/command_buffer/validity/copy_image.rs b/vulkano/src/command_buffer/validity/copy_image.rs index b96f688219..148b4cda03 100644 --- a/vulkano/src/command_buffer/validity/copy_image.rs +++ b/vulkano/src/command_buffer/validity/copy_image.rs @@ -10,12 +10,12 @@ use std::error; use std::fmt; -use device::Device; -use format::FormatTy; -use format::PossibleCompressedFormatDesc; -use image::ImageAccess; -use image::ImageDimensions; -use VulkanObject; +use crate::device::Device; +use crate::format::FormatTy; +use crate::format::PossibleCompressedFormatDesc; +use crate::image::ImageAccess; +use crate::image::ImageDimensions; +use crate::VulkanObject; /// Checks whether a copy image command is valid. /// diff --git a/vulkano/src/command_buffer/validity/copy_image_buffer.rs b/vulkano/src/command_buffer/validity/copy_image_buffer.rs index 02eea0988f..395cc93dbc 100644 --- a/vulkano/src/command_buffer/validity/copy_image_buffer.rs +++ b/vulkano/src/command_buffer/validity/copy_image_buffer.rs @@ -10,14 +10,14 @@ use std::error; use std::fmt; -use buffer::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use format::AcceptsPixels; -use format::Format; -use format::IncompatiblePixelsType; -use image::ImageAccess; -use VulkanObject; +use crate::buffer::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::AcceptsPixels; +use crate::format::Format; +use crate::format::IncompatiblePixelsType; +use crate::image::ImageAccess; +use crate::VulkanObject; /// Type of operation to check. #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -141,7 +141,7 @@ where #[cfg(test)] mod tests { use crate::format::Format; - use command_buffer::validity::copy_image_buffer::required_len_for_format; + use crate::command_buffer::validity::copy_image_buffer::required_len_for_format; #[test] fn test_required_len_for_format() { diff --git a/vulkano/src/command_buffer/validity/descriptor_sets.rs b/vulkano/src/command_buffer/validity/descriptor_sets.rs index 9bba1dae2c..600259ca6c 100644 --- a/vulkano/src/command_buffer/validity/descriptor_sets.rs +++ b/vulkano/src/command_buffer/validity/descriptor_sets.rs @@ -10,9 +10,9 @@ use std::error; use std::fmt; -use descriptor::descriptor::DescriptorDescSupersetError; -use descriptor::descriptor_set::DescriptorSetsCollection; -use descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::descriptor::DescriptorDescSupersetError; +use crate::descriptor::descriptor_set::DescriptorSetsCollection; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; /// Checks whether descriptor sets are compatible with the pipeline. pub fn check_descriptor_sets_validity( diff --git a/vulkano/src/command_buffer/validity/dispatch.rs b/vulkano/src/command_buffer/validity/dispatch.rs index b486bd2318..c9859dfd5c 100644 --- a/vulkano/src/command_buffer/validity/dispatch.rs +++ b/vulkano/src/command_buffer/validity/dispatch.rs @@ -10,7 +10,7 @@ use std::error; use std::fmt; -use device::Device; +use crate::device::Device; /// Checks whether the dispatch dimensions are supported by the device. pub fn check_dispatch(device: &Device, dimensions: [u32; 3]) -> Result<(), CheckDispatchError> { @@ -60,7 +60,7 @@ impl fmt::Display for CheckDispatchError { #[cfg(test)] mod tests { - use command_buffer::validity; + use crate::command_buffer::validity; #[test] fn max_checked() { diff --git a/vulkano/src/command_buffer/validity/dynamic_state.rs b/vulkano/src/command_buffer/validity/dynamic_state.rs index 0d1ec6bce3..f9a65adbb8 100644 --- a/vulkano/src/command_buffer/validity/dynamic_state.rs +++ b/vulkano/src/command_buffer/validity/dynamic_state.rs @@ -10,8 +10,8 @@ use std::error; use std::fmt; -use command_buffer::DynamicState; -use pipeline::GraphicsPipelineAbstract; +use crate::command_buffer::DynamicState; +use crate::pipeline::GraphicsPipelineAbstract; /// Checks whether states that are about to be set are correct. pub fn check_dynamic_state_validity( diff --git a/vulkano/src/command_buffer/validity/fill_buffer.rs b/vulkano/src/command_buffer/validity/fill_buffer.rs index 63b96768c0..e514d2bd3c 100644 --- a/vulkano/src/command_buffer/validity/fill_buffer.rs +++ b/vulkano/src/command_buffer/validity/fill_buffer.rs @@ -10,10 +10,10 @@ use std::error; use std::fmt; -use buffer::BufferAccess; -use device::Device; -use device::DeviceOwned; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::VulkanObject; /// Checks whether a fill buffer command is valid. /// @@ -72,8 +72,8 @@ impl fmt::Display for CheckFillBufferError { #[cfg(test)] mod tests { use super::*; - use buffer::BufferUsage; - use buffer::CpuAccessibleBuffer; + use crate::buffer::BufferUsage; + use crate::buffer::CpuAccessibleBuffer; #[test] fn missing_usage() { diff --git a/vulkano/src/command_buffer/validity/index_buffer.rs b/vulkano/src/command_buffer/validity/index_buffer.rs index 807be0175e..669400c071 100644 --- a/vulkano/src/command_buffer/validity/index_buffer.rs +++ b/vulkano/src/command_buffer/validity/index_buffer.rs @@ -10,12 +10,12 @@ use std::error; use std::fmt; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use pipeline::input_assembly::Index; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::pipeline::input_assembly::Index; +use crate::VulkanObject; /// Checks whether an index buffer can be bound. /// @@ -94,8 +94,8 @@ impl fmt::Display for CheckIndexBufferError { #[cfg(test)] mod tests { use super::*; - use buffer::BufferUsage; - use buffer::CpuAccessibleBuffer; + use crate::buffer::BufferUsage; + use crate::buffer::CpuAccessibleBuffer; #[test] fn num_indices() { diff --git a/vulkano/src/command_buffer/validity/push_constants.rs b/vulkano/src/command_buffer/validity/push_constants.rs index e9fb92e0e3..2ee972fd4a 100644 --- a/vulkano/src/command_buffer/validity/push_constants.rs +++ b/vulkano/src/command_buffer/validity/push_constants.rs @@ -10,8 +10,8 @@ use std::error; use std::fmt; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use descriptor::pipeline_layout::PipelineLayoutPushConstantsCompatible; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::descriptor::pipeline_layout::PipelineLayoutPushConstantsCompatible; /// Checks whether push constants are compatible with the pipeline. pub fn check_push_constants_validity( diff --git a/vulkano/src/command_buffer/validity/update_buffer.rs b/vulkano/src/command_buffer/validity/update_buffer.rs index 221641a7e7..ec95324aa4 100644 --- a/vulkano/src/command_buffer/validity/update_buffer.rs +++ b/vulkano/src/command_buffer/validity/update_buffer.rs @@ -12,10 +12,10 @@ use std::error; use std::fmt; use std::mem; -use buffer::TypedBufferAccess; -use device::Device; -use device::DeviceOwned; -use VulkanObject; +use crate::buffer::TypedBufferAccess; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::VulkanObject; /// Checks whether an update buffer command is valid. /// @@ -93,9 +93,9 @@ impl fmt::Display for CheckUpdateBufferError { #[cfg(test)] mod tests { use super::*; - use buffer::BufferAccess; - use buffer::BufferUsage; - use buffer::CpuAccessibleBuffer; + use crate::buffer::BufferAccess; + use crate::buffer::BufferUsage; + use crate::buffer::CpuAccessibleBuffer; #[test] fn missing_usage() { diff --git a/vulkano/src/command_buffer/validity/vertex_buffers.rs b/vulkano/src/command_buffer/validity/vertex_buffers.rs index 358ebe9253..0ef9fb5435 100644 --- a/vulkano/src/command_buffer/validity/vertex_buffers.rs +++ b/vulkano/src/command_buffer/validity/vertex_buffers.rs @@ -10,10 +10,10 @@ use std::error; use std::fmt; -use buffer::BufferAccess; -use device::DeviceOwned; -use pipeline::vertex::VertexSource; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::device::DeviceOwned; +use crate::pipeline::vertex::VertexSource; +use crate::VulkanObject; /// Checks whether vertex buffers can be bound. /// diff --git a/vulkano/src/descriptor/descriptor.rs b/vulkano/src/descriptor/descriptor.rs index 4589c4efe3..63ed718463 100644 --- a/vulkano/src/descriptor/descriptor.rs +++ b/vulkano/src/descriptor/descriptor.rs @@ -41,15 +41,15 @@ //! in a render pass. Can only give access to the same pixel as the one you're processing. //! -use format::Format; -use image::view::ImageViewType; +use crate::format::Format; +use crate::image::view::ImageViewType; use std::cmp; use std::error; use std::fmt; use std::ops::BitOr; -use sync::AccessFlagBits; -use sync::PipelineStages; -use vk; +use crate::sync::AccessFlagBits; +use crate::sync::PipelineStages; +use crate::vk; /// Contains the exact description of a single descriptor. /// diff --git a/vulkano/src/descriptor/descriptor_set/collection.rs b/vulkano/src/descriptor/descriptor_set/collection.rs index 5df82d520a..6e6304d9a9 100644 --- a/vulkano/src/descriptor/descriptor_set/collection.rs +++ b/vulkano/src/descriptor/descriptor_set/collection.rs @@ -7,9 +7,9 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::DescriptorSet; -use descriptor::descriptor_set::DescriptorSetDesc; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::DescriptorSet; +use crate::descriptor::descriptor_set::DescriptorSetDesc; /// A collection of descriptor set objects. pub unsafe trait DescriptorSetsCollection { diff --git a/vulkano/src/descriptor/descriptor_set/fixed_size_pool.rs b/vulkano/src/descriptor/descriptor_set/fixed_size_pool.rs index f67225b82c..1144fa3b79 100644 --- a/vulkano/src/descriptor/descriptor_set/fixed_size_pool.rs +++ b/vulkano/src/descriptor/descriptor_set/fixed_size_pool.rs @@ -12,24 +12,24 @@ use std::hash::Hash; use std::hash::Hasher; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::BufferViewRef; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::persistent::*; -use descriptor::descriptor_set::DescriptorPool; -use descriptor::descriptor_set::DescriptorPoolAlloc; -use descriptor::descriptor_set::DescriptorPoolAllocError; -use descriptor::descriptor_set::DescriptorSet; -use descriptor::descriptor_set::DescriptorSetDesc; -use descriptor::descriptor_set::UnsafeDescriptorPool; -use descriptor::descriptor_set::UnsafeDescriptorSet; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use device::Device; -use device::DeviceOwned; -use image::view::ImageViewAbstract; -use sampler::Sampler; -use OomError; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::buffer::BufferViewRef; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::persistent::*; +use crate::descriptor::descriptor_set::DescriptorPool; +use crate::descriptor::descriptor_set::DescriptorPoolAlloc; +use crate::descriptor::descriptor_set::DescriptorPoolAllocError; +use crate::descriptor::descriptor_set::DescriptorSet; +use crate::descriptor::descriptor_set::DescriptorSetDesc; +use crate::descriptor::descriptor_set::UnsafeDescriptorPool; +use crate::descriptor::descriptor_set::UnsafeDescriptorSet; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::image::view::ImageViewAbstract; +use crate::sampler::Sampler; +use crate::OomError; +use crate::VulkanObject; /// Pool of descriptor sets of a specific capacity and that are automatically reclaimed. /// diff --git a/vulkano/src/descriptor/descriptor_set/mod.rs b/vulkano/src/descriptor/descriptor_set/mod.rs index cf2d9d5411..efc2f38a73 100644 --- a/vulkano/src/descriptor/descriptor_set/mod.rs +++ b/vulkano/src/descriptor/descriptor_set/mod.rs @@ -38,12 +38,12 @@ use std::hash::Hash; use std::hash::Hasher; -use buffer::BufferAccess; -use descriptor::descriptor::DescriptorDesc; -use device::DeviceOwned; -use image::view::ImageViewAbstract; -use SafeDeref; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::device::DeviceOwned; +use crate::image::view::ImageViewAbstract; +use crate::SafeDeref; +use crate::VulkanObject; pub use self::collection::DescriptorSetsCollection; pub use self::fixed_size_pool::FixedSizeDescriptorSet; diff --git a/vulkano/src/descriptor/descriptor_set/persistent.rs b/vulkano/src/descriptor/descriptor_set/persistent.rs index 0ec1f07afe..0501428db7 100644 --- a/vulkano/src/descriptor/descriptor_set/persistent.rs +++ b/vulkano/src/descriptor/descriptor_set/persistent.rs @@ -13,29 +13,29 @@ use std::hash::Hash; use std::hash::Hasher; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::BufferViewRef; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor::DescriptorDescTy; -use descriptor::descriptor::DescriptorImageDesc; -use descriptor::descriptor::DescriptorImageDescArray; -use descriptor::descriptor::DescriptorImageDescDimensions; -use descriptor::descriptor::DescriptorType; -use descriptor::descriptor_set::DescriptorPool; -use descriptor::descriptor_set::DescriptorPoolAlloc; -use descriptor::descriptor_set::DescriptorSet; -use descriptor::descriptor_set::DescriptorSetDesc; -use descriptor::descriptor_set::DescriptorWrite; -use descriptor::descriptor_set::StdDescriptorPoolAlloc; -use descriptor::descriptor_set::UnsafeDescriptorSet; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use device::Device; -use device::DeviceOwned; -use format::Format; -use image::view::ImageViewAbstract; -use sampler::Sampler; -use OomError; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::buffer::BufferViewRef; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor::DescriptorDescTy; +use crate::descriptor::descriptor::DescriptorImageDesc; +use crate::descriptor::descriptor::DescriptorImageDescArray; +use crate::descriptor::descriptor::DescriptorImageDescDimensions; +use crate::descriptor::descriptor::DescriptorType; +use crate::descriptor::descriptor_set::DescriptorPool; +use crate::descriptor::descriptor_set::DescriptorPoolAlloc; +use crate::descriptor::descriptor_set::DescriptorSet; +use crate::descriptor::descriptor_set::DescriptorSetDesc; +use crate::descriptor::descriptor_set::DescriptorWrite; +use crate::descriptor::descriptor_set::StdDescriptorPoolAlloc; +use crate::descriptor::descriptor_set::UnsafeDescriptorSet; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::Format; +use crate::image::view::ImageViewAbstract; +use crate::sampler::Sampler; +use crate::OomError; +use crate::VulkanObject; /// An immutable descriptor set that is expected to be long-lived. /// diff --git a/vulkano/src/descriptor/descriptor_set/std_pool.rs b/vulkano/src/descriptor/descriptor_set/std_pool.rs index 36ef0fedc1..4fdd497207 100644 --- a/vulkano/src/descriptor/descriptor_set/std_pool.rs +++ b/vulkano/src/descriptor/descriptor_set/std_pool.rs @@ -10,16 +10,16 @@ use std::sync::Arc; use std::sync::Mutex; -use descriptor::descriptor_set::DescriptorPool; -use descriptor::descriptor_set::DescriptorPoolAlloc; -use descriptor::descriptor_set::DescriptorPoolAllocError; -use descriptor::descriptor_set::DescriptorsCount; -use descriptor::descriptor_set::UnsafeDescriptorPool; -use descriptor::descriptor_set::UnsafeDescriptorSet; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use device::Device; -use device::DeviceOwned; -use OomError; +use crate::descriptor::descriptor_set::DescriptorPool; +use crate::descriptor::descriptor_set::DescriptorPoolAlloc; +use crate::descriptor::descriptor_set::DescriptorPoolAllocError; +use crate::descriptor::descriptor_set::DescriptorsCount; +use crate::descriptor::descriptor_set::UnsafeDescriptorPool; +use crate::descriptor::descriptor_set::UnsafeDescriptorSet; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::OomError; /// Standard implementation of a descriptor pool. /// @@ -181,12 +181,12 @@ impl Drop for StdDescriptorPoolAlloc { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorDesc; - use descriptor::descriptor::DescriptorDescTy; - use descriptor::descriptor::ShaderStages; - use descriptor::descriptor_set::DescriptorPool; - use descriptor::descriptor_set::StdDescriptorPool; - use descriptor::descriptor_set::UnsafeDescriptorSetLayout; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::descriptor::DescriptorDescTy; + use crate::descriptor::descriptor::ShaderStages; + use crate::descriptor::descriptor_set::DescriptorPool; + use crate::descriptor::descriptor_set::StdDescriptorPool; + use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; use std::iter; use std::sync::Arc; diff --git a/vulkano/src/descriptor/descriptor_set/sys.rs b/vulkano/src/descriptor/descriptor_set/sys.rs index 5c27b77866..c915c8bb53 100644 --- a/vulkano/src/descriptor/descriptor_set/sys.rs +++ b/vulkano/src/descriptor/descriptor_set/sys.rs @@ -17,20 +17,20 @@ use std::ptr; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use buffer::BufferAccess; -use buffer::BufferInner; -use buffer::BufferView; -use descriptor::descriptor::DescriptorType; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use device::Device; -use device::DeviceOwned; -use image::view::ImageViewAbstract; -use sampler::Sampler; - -use check_errors; -use vk; -use OomError; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::buffer::BufferInner; +use crate::buffer::BufferView; +use crate::descriptor::descriptor::DescriptorType; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::image::view::ImageViewAbstract; +use crate::sampler::Sampler; + +use crate::check_errors; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; /// A pool from which descriptor sets can be allocated. /// @@ -1133,13 +1133,13 @@ impl DescriptorWrite { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorBufferDesc; - use descriptor::descriptor::DescriptorDesc; - use descriptor::descriptor::DescriptorDescTy; - use descriptor::descriptor::ShaderStages; - use descriptor::descriptor_set::DescriptorsCount; - use descriptor::descriptor_set::UnsafeDescriptorPool; - use descriptor::descriptor_set::UnsafeDescriptorSetLayout; + use crate::descriptor::descriptor::DescriptorBufferDesc; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::descriptor::DescriptorDescTy; + use crate::descriptor::descriptor::ShaderStages; + use crate::descriptor::descriptor_set::DescriptorsCount; + use crate::descriptor::descriptor_set::UnsafeDescriptorPool; + use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; use std::iter; #[test] diff --git a/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs b/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs index 5dad51a827..41660b7808 100644 --- a/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs +++ b/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs @@ -13,16 +13,16 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use check_errors; -use vk; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::DescriptorSetDesc; -use descriptor::descriptor_set::DescriptorsCount; -use device::Device; -use device::DeviceOwned; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::DescriptorSetDesc; +use crate::descriptor::descriptor_set::DescriptorsCount; +use crate::device::Device; +use crate::device::DeviceOwned; /// Describes to the Vulkan implementation the layout of all descriptors within a descriptor set. /// @@ -168,12 +168,12 @@ impl Drop for UnsafeDescriptorSetLayout { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorBufferDesc; - use descriptor::descriptor::DescriptorDesc; - use descriptor::descriptor::DescriptorDescTy; - use descriptor::descriptor::ShaderStages; - use descriptor::descriptor_set::DescriptorsCount; - use descriptor::descriptor_set::UnsafeDescriptorSetLayout; + use crate::descriptor::descriptor::DescriptorBufferDesc; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::descriptor::DescriptorDescTy; + use crate::descriptor::descriptor::ShaderStages; + use crate::descriptor::descriptor_set::DescriptorsCount; + use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; use std::iter; #[test] diff --git a/vulkano/src/descriptor/pipeline_layout/empty.rs b/vulkano/src/descriptor/pipeline_layout/empty.rs index 221b9f9b76..1bb8225af4 100644 --- a/vulkano/src/descriptor/pipeline_layout/empty.rs +++ b/vulkano/src/descriptor/pipeline_layout/empty.rs @@ -7,9 +7,9 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use descriptor::descriptor::DescriptorDesc; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; /// Description of an empty pipeline layout. /// diff --git a/vulkano/src/descriptor/pipeline_layout/limits_check.rs b/vulkano/src/descriptor/pipeline_layout/limits_check.rs index f16a7d3cd2..69c6482ecf 100644 --- a/vulkano/src/descriptor/pipeline_layout/limits_check.rs +++ b/vulkano/src/descriptor/pipeline_layout/limits_check.rs @@ -12,11 +12,11 @@ use std::error; use std::fmt; -use descriptor::descriptor::DescriptorType; -use descriptor::descriptor::ShaderStages; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; -use instance::Limits; +use crate::descriptor::descriptor::DescriptorType; +use crate::descriptor::descriptor::ShaderStages; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::instance::Limits; /// Checks whether the pipeline layout description fulfills the device limits requirements. pub fn check_desc_against_limits( diff --git a/vulkano/src/descriptor/pipeline_layout/runtime_desc.rs b/vulkano/src/descriptor/pipeline_layout/runtime_desc.rs index e69d1efd1e..b4095a7218 100644 --- a/vulkano/src/descriptor/pipeline_layout/runtime_desc.rs +++ b/vulkano/src/descriptor/pipeline_layout/runtime_desc.rs @@ -12,9 +12,9 @@ use std::fmt; use smallvec::SmallVec; -use descriptor::descriptor::DescriptorDesc; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; /// Runtime description of a pipeline layout. #[derive(Debug, Clone)] @@ -124,11 +124,11 @@ impl fmt::Display for RuntimePipelineDescError { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorDesc; - use descriptor::descriptor::ShaderStages; - use descriptor::pipeline_layout::PipelineLayoutDescPcRange; - use descriptor::pipeline_layout::RuntimePipelineDesc; - use descriptor::pipeline_layout::RuntimePipelineDescError; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::descriptor::ShaderStages; + use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; + use crate::descriptor::pipeline_layout::RuntimePipelineDesc; + use crate::descriptor::pipeline_layout::RuntimePipelineDescError; use std::iter; #[test] diff --git a/vulkano/src/descriptor/pipeline_layout/sys.rs b/vulkano/src/descriptor/pipeline_layout/sys.rs index c1a4346658..234923c3b8 100644 --- a/vulkano/src/descriptor/pipeline_layout/sys.rs +++ b/vulkano/src/descriptor/pipeline_layout/sys.rs @@ -14,21 +14,21 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; - -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor::ShaderStages; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; -use descriptor::pipeline_layout::PipelineLayoutLimitsError; -use device::Device; -use device::DeviceOwned; +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; + +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor::ShaderStages; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::pipeline_layout::PipelineLayoutLimitsError; +use crate::device::Device; +use crate::device::DeviceOwned; /// Wrapper around the `PipelineLayout` Vulkan object. Describes to the Vulkan implementation the /// descriptor sets and push constants available to your shaders diff --git a/vulkano/src/descriptor/pipeline_layout/traits.rs b/vulkano/src/descriptor/pipeline_layout/traits.rs index b1ea8f6ed3..c5e09d4eb5 100644 --- a/vulkano/src/descriptor/pipeline_layout/traits.rs +++ b/vulkano/src/descriptor/pipeline_layout/traits.rs @@ -12,19 +12,19 @@ use std::error; use std::fmt; use std::sync::Arc; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor::DescriptorDescSupersetError; -use descriptor::descriptor::ShaderStages; -use descriptor::descriptor_set::DescriptorSetsCollection; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use descriptor::pipeline_layout::limits_check; -use descriptor::pipeline_layout::PipelineLayout; -use descriptor::pipeline_layout::PipelineLayoutCreationError; -use descriptor::pipeline_layout::PipelineLayoutDescUnion; -use descriptor::pipeline_layout::PipelineLayoutSys; -use device::Device; -use device::DeviceOwned; -use SafeDeref; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor::DescriptorDescSupersetError; +use crate::descriptor::descriptor::ShaderStages; +use crate::descriptor::descriptor_set::DescriptorSetsCollection; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::descriptor::pipeline_layout::limits_check; +use crate::descriptor::pipeline_layout::PipelineLayout; +use crate::descriptor::pipeline_layout::PipelineLayoutCreationError; +use crate::descriptor::pipeline_layout::PipelineLayoutDescUnion; +use crate::descriptor::pipeline_layout::PipelineLayoutSys; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::SafeDeref; /// Trait for objects that describe the layout of the descriptors and push constants of a pipeline. pub unsafe trait PipelineLayoutAbstract: PipelineLayoutDesc + DeviceOwned { @@ -177,7 +177,7 @@ where Other: PipelineLayoutDesc, { /// Makes sure that `self` is a superset of `Other`. Returns an `Err` if this is not the case. - fn ensure_superset_of(&self, &Other) -> Result<(), PipelineLayoutNotSupersetError>; + fn ensure_superset_of(&self, other: &Other) -> Result<(), PipelineLayoutNotSupersetError>; } unsafe impl PipelineLayoutSuperset for T @@ -289,7 +289,7 @@ where Other: DescriptorSetsCollection, { /// Returns true if `Other` can be used with a pipeline that uses `self` as layout. - fn is_compatible(&self, &Other) -> bool; + fn is_compatible(&self, sets: &Other) -> bool; } unsafe impl PipelineLayoutSetsCompatible for T @@ -329,14 +329,14 @@ pub unsafe trait PipelineLayoutPushConstantsCompatible: PipelineLayoutDesc { /// Returns true if `Pc` can be used with a pipeline that uses `self` as layout. - fn is_compatible(&self, &Pc) -> bool; + fn is_compatible(&self, constants: &Pc) -> bool; } unsafe impl PipelineLayoutPushConstantsCompatible for T where T: PipelineLayoutDesc, { - fn is_compatible(&self, _: &U) -> bool { + fn is_compatible(&self, constants: &U) -> bool { // FIXME: true } diff --git a/vulkano/src/descriptor/pipeline_layout/tweaks.rs b/vulkano/src/descriptor/pipeline_layout/tweaks.rs index 66e64c1bfa..3c9d4e8bec 100644 --- a/vulkano/src/descriptor/pipeline_layout/tweaks.rs +++ b/vulkano/src/descriptor/pipeline_layout/tweaks.rs @@ -7,11 +7,11 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use descriptor::descriptor::DescriptorBufferDesc; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor::DescriptorDescTy; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::descriptor::DescriptorBufferDesc; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor::DescriptorDescTy; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; use fnv::FnvHashSet; /// Transforms a `PipelineLayoutDesc`. diff --git a/vulkano/src/descriptor/pipeline_layout/union.rs b/vulkano/src/descriptor/pipeline_layout/union.rs index 2775b30f0d..3daba5b1bc 100644 --- a/vulkano/src/descriptor/pipeline_layout/union.rs +++ b/vulkano/src/descriptor/pipeline_layout/union.rs @@ -7,10 +7,10 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; use std::cmp; use std::sync::Arc; diff --git a/vulkano/src/device/extensions.rs b/vulkano/src/device/extensions.rs index 214d7cd926..d5456a059a 100644 --- a/vulkano/src/device/extensions.rs +++ b/vulkano/src/device/extensions.rs @@ -14,11 +14,11 @@ use std::iter::FromIterator; use std::ptr; use std::str; -use check_errors; -use extensions::SupportedExtensionsError; -use instance::PhysicalDevice; -use vk; -use VulkanObject; +use crate::check_errors; +use crate::extensions::SupportedExtensionsError; +use crate::instance::PhysicalDevice; +use crate::vk; +use crate::VulkanObject; macro_rules! device_extensions { ($sname:ident, $rawname:ident, [$($ext_req_if_supported:ident,)*], $($ext:ident => $s:expr,)*) => ( @@ -155,7 +155,7 @@ pub struct Unbuildable(()); #[cfg(test)] mod tests { - use device::{DeviceExtensions, RawDeviceExtensions}; + use crate::device::{DeviceExtensions, RawDeviceExtensions}; #[test] fn empty_extensions() { diff --git a/vulkano/src/device/mod.rs b/vulkano/src/device/mod.rs index 5f4c448062..1b96da4342 100644 --- a/vulkano/src/device/mod.rs +++ b/vulkano/src/device/mod.rs @@ -107,32 +107,32 @@ use std::sync::Mutex; use std::sync::MutexGuard; use std::sync::Weak; -use command_buffer::pool::StandardCommandPool; -use descriptor::descriptor_set::StdDescriptorPool; -use instance::Instance; -use instance::PhysicalDevice; -use instance::QueueFamily; -use memory::pool::StdMemoryPool; - -use check_errors; -use vk; -use Error; -use OomError; -use SynchronizedVulkanObject; -use VulkanHandle; -use VulkanObject; +use crate::command_buffer::pool::StandardCommandPool; +use crate::descriptor::descriptor_set::StdDescriptorPool; +use crate::instance::Instance; +use crate::instance::PhysicalDevice; +use crate::instance::QueueFamily; +use crate::memory::pool::StdMemoryPool; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SynchronizedVulkanObject; +use crate::VulkanHandle; +use crate::VulkanObject; pub use self::extensions::DeviceExtensions; pub use self::extensions::RawDeviceExtensions; -pub use features::Features; +pub use crate::features::Features; mod extensions; -use format::Format; -use image::ImageCreateFlags; -use image::ImageFormatProperties; -use image::ImageTiling; -use image::ImageType; -use image::ImageUsage; +use crate::format::Format; +use crate::image::ImageCreateFlags; +use crate::image::ImageFormatProperties; +use crate::image::ImageTiling; +use crate::image::ImageType; +use crate::image::ImageUsage; /// Represents a Vulkan context. pub struct Device { @@ -850,11 +850,11 @@ unsafe impl SynchronizedVulkanObject for Queue { #[cfg(test)] mod tests { - use device::Device; - use device::DeviceCreationError; - use device::DeviceExtensions; - use features::Features; - use instance; + use crate::device::Device; + use crate::device::DeviceCreationError; + use crate::device::DeviceExtensions; + use crate::features::Features; + use crate::instance; use std::sync::Arc; #[test] diff --git a/vulkano/src/extensions.rs b/vulkano/src/extensions.rs index 14b07af921..1c76abe6f7 100644 --- a/vulkano/src/extensions.rs +++ b/vulkano/src/extensions.rs @@ -10,9 +10,9 @@ use std::error; use std::fmt; -use instance::loader::LoadingError; -use Error; -use OomError; +use crate::instance::loader::LoadingError; +use crate::Error; +use crate::OomError; macro_rules! extensions { ($sname:ident, $rawname:ident, $($ext:ident => $s:expr,)*) => ( diff --git a/vulkano/src/features.rs b/vulkano/src/features.rs index be13da8951..faded1c019 100644 --- a/vulkano/src/features.rs +++ b/vulkano/src/features.rs @@ -11,7 +11,7 @@ use std::marker::PhantomPinned; use std::pin::Pin; use std::{mem, ptr}; -use vk; +use crate::vk; macro_rules! features_init { (core { $name:ident => $vk:ident }, $out:expr, $val:expr) => { diff --git a/vulkano/src/format.rs b/vulkano/src/format.rs index 989dd1fc67..623997fc6a 100644 --- a/vulkano/src/format.rs +++ b/vulkano/src/format.rs @@ -107,10 +107,10 @@ use std::vec::IntoIter as VecIntoIter; use std::{error, fmt, mem}; use half::f16; -use instance::PhysicalDevice; +use crate::instance::PhysicalDevice; -use vk; -use VulkanObject; +use crate::vk; +use crate::VulkanObject; // TODO: add enumerations for color, depth, stencil and depthstencil formats diff --git a/vulkano/src/framebuffer/attachments_list.rs b/vulkano/src/framebuffer/attachments_list.rs index 0aa8a88c3f..2f32d430ed 100644 --- a/vulkano/src/framebuffer/attachments_list.rs +++ b/vulkano/src/framebuffer/attachments_list.rs @@ -7,9 +7,9 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use image::view::ImageViewAbstract; +use crate::image::view::ImageViewAbstract; use std::sync::Arc; -use SafeDeref; +use crate::SafeDeref; //use sync::AccessFlagBits; //use sync::PipelineStages; diff --git a/vulkano/src/framebuffer/compat_atch.rs b/vulkano/src/framebuffer/compat_atch.rs index a8f73a839b..22b61560a4 100644 --- a/vulkano/src/framebuffer/compat_atch.rs +++ b/vulkano/src/framebuffer/compat_atch.rs @@ -10,9 +10,9 @@ //! This module contains the `ensure_image_view_compatible` function, which verifies whether //! an image view can be used as a render pass attachment. -use format::Format; -use framebuffer::RenderPassDesc; -use image::view::ImageViewAbstract; +use crate::format::Format; +use crate::framebuffer::RenderPassDesc; +use crate::image::view::ImageViewAbstract; use std::error; use std::fmt; @@ -181,10 +181,10 @@ impl fmt::Display for IncompatibleRenderPassAttachmentError { mod tests { use super::ensure_image_view_compatible; use super::IncompatibleRenderPassAttachmentError; - use format::Format; - use framebuffer::EmptySinglePassRenderPassDesc; - use image::view::ImageView; - use image::AttachmentImage; + use crate::format::Format; + use crate::framebuffer::EmptySinglePassRenderPassDesc; + use crate::image::view::ImageView; + use crate::image::AttachmentImage; #[test] fn basic_ok() { diff --git a/vulkano/src/framebuffer/desc.rs b/vulkano/src/framebuffer/desc.rs index c25e303f6a..5ce920902f 100644 --- a/vulkano/src/framebuffer/desc.rs +++ b/vulkano/src/framebuffer/desc.rs @@ -9,20 +9,20 @@ use std::sync::Arc; -use device::Device; -use format::ClearValue; -use format::Format; -use format::FormatTy; -use framebuffer::RenderPass; -use framebuffer::RenderPassCompatible; -use framebuffer::RenderPassCreationError; -use framebuffer::RenderPassDescClearValues; -use image::ImageLayout; -use sync::AccessFlagBits; -use sync::PipelineStages; - -use vk; -use SafeDeref; +use crate::device::Device; +use crate::format::ClearValue; +use crate::format::Format; +use crate::format::FormatTy; +use crate::framebuffer::RenderPass; +use crate::framebuffer::RenderPassCompatible; +use crate::framebuffer::RenderPassCreationError; +use crate::framebuffer::RenderPassDescClearValues; +use crate::image::ImageLayout; +use crate::sync::AccessFlagBits; +use crate::sync::PipelineStages; + +use crate::vk; +use crate::SafeDeref; /// Trait for objects that contain the description of a render pass. /// diff --git a/vulkano/src/framebuffer/empty.rs b/vulkano/src/framebuffer/empty.rs index 4eb0fd79b5..5d4305c816 100644 --- a/vulkano/src/framebuffer/empty.rs +++ b/vulkano/src/framebuffer/empty.rs @@ -7,12 +7,12 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use format::ClearValue; -use framebuffer::AttachmentDescription; -use framebuffer::PassDependencyDescription; -use framebuffer::PassDescription; -use framebuffer::RenderPassDesc; -use framebuffer::RenderPassDescClearValues; +use crate::format::ClearValue; +use crate::framebuffer::AttachmentDescription; +use crate::framebuffer::PassDependencyDescription; +use crate::framebuffer::PassDescription; +use crate::framebuffer::RenderPassDesc; +use crate::framebuffer::RenderPassDescClearValues; use std::iter; /// Description of an empty render pass. diff --git a/vulkano/src/framebuffer/framebuffer.rs b/vulkano/src/framebuffer/framebuffer.rs index 0455f31f8e..0d0f6a225b 100644 --- a/vulkano/src/framebuffer/framebuffer.rs +++ b/vulkano/src/framebuffer/framebuffer.rs @@ -16,27 +16,27 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use device::Device; -use device::DeviceOwned; -use format::ClearValue; -use framebuffer::ensure_image_view_compatible; -use framebuffer::AttachmentDescription; -use framebuffer::AttachmentsList; -use framebuffer::FramebufferAbstract; -use framebuffer::IncompatibleRenderPassAttachmentError; -use framebuffer::PassDependencyDescription; -use framebuffer::PassDescription; -use framebuffer::RenderPassAbstract; -use framebuffer::RenderPassDesc; -use framebuffer::RenderPassDescClearValues; -use framebuffer::RenderPassSys; -use image::view::ImageViewAbstract; - -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::ClearValue; +use crate::framebuffer::ensure_image_view_compatible; +use crate::framebuffer::AttachmentDescription; +use crate::framebuffer::AttachmentsList; +use crate::framebuffer::FramebufferAbstract; +use crate::framebuffer::IncompatibleRenderPassAttachmentError; +use crate::framebuffer::PassDependencyDescription; +use crate::framebuffer::PassDescription; +use crate::framebuffer::RenderPassAbstract; +use crate::framebuffer::RenderPassDesc; +use crate::framebuffer::RenderPassDescClearValues; +use crate::framebuffer::RenderPassSys; +use crate::image::view::ImageViewAbstract; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Contains a render pass and the image views that are attached to it. /// @@ -559,13 +559,13 @@ impl From for FramebufferCreationError { #[cfg(test)] mod tests { - use format::Format; - use framebuffer::EmptySinglePassRenderPassDesc; - use framebuffer::Framebuffer; - use framebuffer::FramebufferCreationError; - use framebuffer::RenderPassDesc; - use image::attachment::AttachmentImage; - use image::view::ImageView; + use crate::format::Format; + use crate::framebuffer::EmptySinglePassRenderPassDesc; + use crate::framebuffer::Framebuffer; + use crate::framebuffer::FramebufferCreationError; + use crate::framebuffer::RenderPassDesc; + use crate::image::attachment::AttachmentImage; + use crate::image::view::ImageView; use std::sync::Arc; #[test] diff --git a/vulkano/src/framebuffer/macros.rs b/vulkano/src/framebuffer/macros.rs index acdbac4ec1..f3d996ebaa 100644 --- a/vulkano/src/framebuffer/macros.rs +++ b/vulkano/src/framebuffer/macros.rs @@ -336,7 +336,7 @@ macro_rules! ordered_passes_renderpass { #[cfg(test)] mod tests { - use format::Format; + use crate::format::Format; #[test] fn single_pass_resolve() { diff --git a/vulkano/src/framebuffer/sys.rs b/vulkano/src/framebuffer/sys.rs index 1d4a8e5c8a..7e0dd44d7e 100644 --- a/vulkano/src/framebuffer/sys.rs +++ b/vulkano/src/framebuffer/sys.rs @@ -16,23 +16,23 @@ use std::ptr; use std::sync::Arc; use std::sync::Mutex; -use device::Device; -use device::DeviceOwned; -use format::ClearValue; -use framebuffer::AttachmentDescription; -use framebuffer::EmptySinglePassRenderPassDesc; -use framebuffer::LoadOp; -use framebuffer::PassDependencyDescription; -use framebuffer::PassDescription; -use framebuffer::RenderPassAbstract; -use framebuffer::RenderPassDesc; -use framebuffer::RenderPassDescClearValues; - -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::ClearValue; +use crate::framebuffer::AttachmentDescription; +use crate::framebuffer::EmptySinglePassRenderPassDesc; +use crate::framebuffer::LoadOp; +use crate::framebuffer::PassDependencyDescription; +use crate::framebuffer::PassDescription; +use crate::framebuffer::RenderPassAbstract; +use crate::framebuffer::RenderPassDesc; +use crate::framebuffer::RenderPassDescClearValues; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Defines the layout of multiple subpasses. /// @@ -592,9 +592,9 @@ impl From for RenderPassCreationError { #[cfg(test)] mod tests { - use format::Format; - use framebuffer::RenderPass; - use framebuffer::RenderPassCreationError; + use crate::format::Format; + use crate::framebuffer::RenderPass; + use crate::framebuffer::RenderPassCreationError; #[test] fn empty() { diff --git a/vulkano/src/framebuffer/traits.rs b/vulkano/src/framebuffer/traits.rs index 5ef2bb089b..0a2b848dbc 100644 --- a/vulkano/src/framebuffer/traits.rs +++ b/vulkano/src/framebuffer/traits.rs @@ -7,15 +7,15 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use device::DeviceOwned; -use format::ClearValue; -use framebuffer::FramebufferSys; -use framebuffer::RenderPassDesc; -use framebuffer::RenderPassSys; -use image::view::ImageViewAbstract; -use pipeline::shader::ShaderInterfaceDef; - -use SafeDeref; +use crate::device::DeviceOwned; +use crate::format::ClearValue; +use crate::framebuffer::FramebufferSys; +use crate::framebuffer::RenderPassDesc; +use crate::framebuffer::RenderPassSys; +use crate::image::view::ImageViewAbstract; +use crate::pipeline::shader::ShaderInterfaceDef; + +use crate::SafeDeref; /// Trait for objects that contain a Vulkan framebuffer object. /// diff --git a/vulkano/src/image/aspect.rs b/vulkano/src/image/aspect.rs index c6392258ef..61b19974fc 100644 --- a/vulkano/src/image/aspect.rs +++ b/vulkano/src/image/aspect.rs @@ -8,7 +8,7 @@ // according to those terms. use std::ops::BitOr; -use vk; +use crate::vk; /// Describes how an aspect of the image that be used to query Vulkan. This is **not** just a suggestion. /// Check out VkImageAspectFlagBits in the Vulkan spec. diff --git a/vulkano/src/image/attachment.rs b/vulkano/src/image/attachment.rs index 05d123c4d6..735cc5194d 100644 --- a/vulkano/src/image/attachment.rs +++ b/vulkano/src/image/attachment.rs @@ -15,33 +15,33 @@ use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::BufferAccess; -use device::Device; -use format::ClearValue; -use format::Format; -use format::FormatDesc; -use format::FormatTy; -use image::sys::ImageCreationError; -use image::sys::UnsafeImage; -use image::traits::ImageAccess; -use image::traits::ImageClearValue; -use image::traits::ImageContent; -use image::ImageCreateFlags; -use image::ImageDescriptorLayouts; -use image::ImageDimensions; -use image::ImageInner; -use image::ImageLayout; -use image::ImageUsage; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPoolAlloc; -use memory::DedicatedAlloc; -use sync::AccessError; -use sync::Sharing; +use crate::buffer::BufferAccess; +use crate::device::Device; +use crate::format::ClearValue; +use crate::format::Format; +use crate::format::FormatDesc; +use crate::format::FormatTy; +use crate::image::sys::ImageCreationError; +use crate::image::sys::UnsafeImage; +use crate::image::traits::ImageAccess; +use crate::image::traits::ImageClearValue; +use crate::image::traits::ImageContent; +use crate::image::ImageCreateFlags; +use crate::image::ImageDescriptorLayouts; +use crate::image::ImageDimensions; +use crate::image::ImageInner; +use crate::image::ImageLayout; +use crate::image::ImageUsage; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPoolAlloc; +use crate::memory::DedicatedAlloc; +use crate::sync::AccessError; +use crate::sync::Sharing; /// ImageAccess whose purpose is to be used as a framebuffer attachment. /// @@ -647,7 +647,7 @@ where #[cfg(test)] mod tests { use super::AttachmentImage; - use format::Format; + use crate::format::Format; #[test] fn create_regular() { diff --git a/vulkano/src/image/immutable.rs b/vulkano/src/image/immutable.rs index dfccd328c8..ebde41c391 100644 --- a/vulkano/src/image/immutable.rs +++ b/vulkano/src/image/immutable.rs @@ -14,43 +14,43 @@ use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::BufferAccess; -use buffer::BufferUsage; -use buffer::CpuAccessibleBuffer; -use buffer::TypedBufferAccess; -use command_buffer::AutoCommandBuffer; -use command_buffer::AutoCommandBufferBuilder; -use command_buffer::CommandBuffer; -use command_buffer::CommandBufferExecFuture; -use device::Device; -use device::Queue; -use format::AcceptsPixels; -use format::Format; -use format::FormatDesc; -use image::sys::ImageCreationError; -use image::sys::UnsafeImage; -use image::traits::ImageAccess; -use image::traits::ImageContent; -use image::ImageCreateFlags; -use image::ImageDescriptorLayouts; -use image::ImageDimensions; -use image::ImageInner; -use image::ImageLayout; -use image::ImageUsage; -use image::MipmapsCount; -use instance::QueueFamily; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPoolAlloc; -use memory::DedicatedAlloc; -use sampler::Filter; -use sync::AccessError; -use sync::NowFuture; -use sync::Sharing; +use crate::buffer::BufferAccess; +use crate::buffer::BufferUsage; +use crate::buffer::CpuAccessibleBuffer; +use crate::buffer::TypedBufferAccess; +use crate::command_buffer::AutoCommandBuffer; +use crate::command_buffer::AutoCommandBufferBuilder; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::CommandBufferExecFuture; +use crate::device::Device; +use crate::device::Queue; +use crate::format::AcceptsPixels; +use crate::format::Format; +use crate::format::FormatDesc; +use crate::image::sys::ImageCreationError; +use crate::image::sys::UnsafeImage; +use crate::image::traits::ImageAccess; +use crate::image::traits::ImageContent; +use crate::image::ImageCreateFlags; +use crate::image::ImageDescriptorLayouts; +use crate::image::ImageDimensions; +use crate::image::ImageInner; +use crate::image::ImageLayout; +use crate::image::ImageUsage; +use crate::image::MipmapsCount; +use crate::instance::QueueFamily; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPoolAlloc; +use crate::memory::DedicatedAlloc; +use crate::sampler::Filter; +use crate::sync::AccessError; +use crate::sync::NowFuture; +use crate::sync::Sharing; /// Image whose purpose is to be used for read-only purposes. You can write to the image once, /// but then you must only ever read from it. diff --git a/vulkano/src/image/layout.rs b/vulkano/src/image/layout.rs index e5e25bcb2d..0de503f523 100644 --- a/vulkano/src/image/layout.rs +++ b/vulkano/src/image/layout.rs @@ -7,7 +7,7 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use vk; +use crate::vk; /// Layout of an image. /// diff --git a/vulkano/src/image/mod.rs b/vulkano/src/image/mod.rs index 4889cce437..881a74dfce 100644 --- a/vulkano/src/image/mod.rs +++ b/vulkano/src/image/mod.rs @@ -486,10 +486,10 @@ impl ImageDimensions { #[cfg(test)] mod tests { - use format; - use image::ImageDimensions; - use image::ImmutableImage; - use image::MipmapsCount; + use crate::format; + use crate::image::ImageDimensions; + use crate::image::ImmutableImage; + use crate::image::MipmapsCount; #[test] fn max_mipmaps() { diff --git a/vulkano/src/image/storage.rs b/vulkano/src/image/storage.rs index 1ca9546890..004fb50c3a 100644 --- a/vulkano/src/image/storage.rs +++ b/vulkano/src/image/storage.rs @@ -14,33 +14,33 @@ use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering; use std::sync::Arc; -use buffer::BufferAccess; -use device::Device; -use format::ClearValue; -use format::FormatDesc; -use format::FormatTy; -use image::sys::ImageCreationError; -use image::sys::UnsafeImage; -use image::traits::ImageAccess; -use image::traits::ImageClearValue; -use image::traits::ImageContent; -use image::ImageCreateFlags; -use image::ImageDescriptorLayouts; -use image::ImageDimensions; -use image::ImageInner; -use image::ImageLayout; -use image::ImageUsage; -use instance::QueueFamily; -use memory::pool::AllocFromRequirementsFilter; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::PotentialDedicatedAllocation; -use memory::pool::StdMemoryPool; -use memory::DedicatedAlloc; -use sync::AccessError; -use sync::Sharing; +use crate::buffer::BufferAccess; +use crate::device::Device; +use crate::format::ClearValue; +use crate::format::FormatDesc; +use crate::format::FormatTy; +use crate::image::sys::ImageCreationError; +use crate::image::sys::UnsafeImage; +use crate::image::traits::ImageAccess; +use crate::image::traits::ImageClearValue; +use crate::image::traits::ImageContent; +use crate::image::ImageCreateFlags; +use crate::image::ImageDescriptorLayouts; +use crate::image::ImageDimensions; +use crate::image::ImageInner; +use crate::image::ImageLayout; +use crate::image::ImageUsage; +use crate::instance::QueueFamily; +use crate::memory::pool::AllocFromRequirementsFilter; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::PotentialDedicatedAllocation; +use crate::memory::pool::StdMemoryPool; +use crate::memory::DedicatedAlloc; +use crate::sync::AccessError; +use crate::sync::Sharing; /// General-purpose image in device memory. Can be used for any usage, but will be slower than a /// specialized image. @@ -333,8 +333,8 @@ where #[cfg(test)] mod tests { use super::StorageImage; - use format::Format; - use image::ImageDimensions; + use crate::format::Format; + use crate::image::ImageDimensions; #[test] fn create() { diff --git a/vulkano/src/image/swapchain.rs b/vulkano/src/image/swapchain.rs index eac818922d..a5e58380db 100644 --- a/vulkano/src/image/swapchain.rs +++ b/vulkano/src/image/swapchain.rs @@ -11,20 +11,20 @@ use std::hash::Hash; use std::hash::Hasher; use std::sync::Arc; -use buffer::BufferAccess; -use format::ClearValue; -use format::Format; -use format::FormatDesc; -use image::traits::ImageAccess; -use image::traits::ImageClearValue; -use image::traits::ImageContent; -use image::ImageDescriptorLayouts; -use image::ImageInner; -use image::ImageLayout; -use swapchain::Swapchain; -use sync::AccessError; - -use OomError; +use crate::buffer::BufferAccess; +use crate::format::ClearValue; +use crate::format::Format; +use crate::format::FormatDesc; +use crate::image::traits::ImageAccess; +use crate::image::traits::ImageClearValue; +use crate::image::traits::ImageContent; +use crate::image::ImageDescriptorLayouts; +use crate::image::ImageInner; +use crate::image::ImageLayout; +use crate::swapchain::Swapchain; +use crate::sync::AccessError; + +use crate::OomError; /// An image that is part of a swapchain. /// diff --git a/vulkano/src/image/sys.rs b/vulkano/src/image/sys.rs index 4d735760e1..d849ddd9a1 100644 --- a/vulkano/src/image/sys.rs +++ b/vulkano/src/image/sys.rs @@ -24,26 +24,26 @@ use std::ops::Range; use std::ptr; use std::sync::Arc; -use device::Device; -use format::Format; -use format::FormatFeatures; -use format::FormatTy; -use format::PossibleYcbcrFormatDesc; -use image::ImageAspect; -use image::ImageCreateFlags; -use image::ImageDimensions; -use image::ImageUsage; -use image::MipmapsCount; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; -use memory::MemoryRequirements; -use sync::Sharing; - -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::device::Device; +use crate::format::Format; +use crate::format::FormatFeatures; +use crate::format::FormatTy; +use crate::format::PossibleYcbcrFormatDesc; +use crate::image::ImageAspect; +use crate::image::ImageCreateFlags; +use crate::image::ImageDimensions; +use crate::image::ImageUsage; +use crate::image::MipmapsCount; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; +use crate::memory::MemoryRequirements; +use crate::sync::Sharing; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// A storage for pixels or arbitrary data. /// @@ -1031,9 +1031,9 @@ mod tests { use super::ImageUsage; use super::UnsafeImage; - use format::Format; - use image::ImageDimensions; - use sync::Sharing; + use crate::format::Format; + use crate::image::ImageDimensions; + use crate::sync::Sharing; #[test] fn create_sampled() { diff --git a/vulkano/src/image/traits.rs b/vulkano/src/image/traits.rs index 998155d107..396a2c61e1 100644 --- a/vulkano/src/image/traits.rs +++ b/vulkano/src/image/traits.rs @@ -10,23 +10,23 @@ use std::hash::Hash; use std::hash::Hasher; -use buffer::BufferAccess; -use format::ClearValue; -use format::Format; -use format::PossibleCompressedFormatDesc; -use format::PossibleDepthFormatDesc; -use format::PossibleDepthStencilFormatDesc; -use format::PossibleFloatFormatDesc; -use format::PossibleSintFormatDesc; -use format::PossibleStencilFormatDesc; -use format::PossibleUintFormatDesc; -use image::sys::UnsafeImage; -use image::ImageDescriptorLayouts; -use image::ImageDimensions; -use image::ImageLayout; -use sync::AccessError; - -use SafeDeref; +use crate::buffer::BufferAccess; +use crate::format::ClearValue; +use crate::format::Format; +use crate::format::PossibleCompressedFormatDesc; +use crate::format::PossibleDepthFormatDesc; +use crate::format::PossibleDepthStencilFormatDesc; +use crate::format::PossibleFloatFormatDesc; +use crate::format::PossibleSintFormatDesc; +use crate::format::PossibleStencilFormatDesc; +use crate::format::PossibleUintFormatDesc; +use crate::image::sys::UnsafeImage; +use crate::image::ImageDescriptorLayouts; +use crate::image::ImageDimensions; +use crate::image::ImageLayout; +use crate::sync::AccessError; + +use crate::SafeDeref; /// Trait for types that represent the way a GPU can access an image. pub unsafe trait ImageAccess { diff --git a/vulkano/src/image/usage.rs b/vulkano/src/image/usage.rs index 3fb74c4ca0..2f19895970 100644 --- a/vulkano/src/image/usage.rs +++ b/vulkano/src/image/usage.rs @@ -8,7 +8,7 @@ // according to those terms. use std::ops::BitOr; -use vk; +use crate::vk; /// Describes how an image is going to be used. This is **not** just an optimization. /// diff --git a/vulkano/src/image/view.rs b/vulkano/src/image/view.rs index 03a6cdc3d9..18cb570c8d 100644 --- a/vulkano/src/image/view.rs +++ b/vulkano/src/image/view.rs @@ -22,20 +22,20 @@ use std::ops::Range; use std::ptr; use std::sync::Arc; -use device::Device; -use format::Format; -use format::FormatTy; -use image::sys::UnsafeImage; -use image::ImageAccess; -use image::ImageDimensions; -use memory::DeviceMemoryAllocError; -use sampler::Sampler; - -use check_errors; -use vk; -use OomError; -use SafeDeref; -use VulkanObject; +use crate::device::Device; +use crate::format::Format; +use crate::format::FormatTy; +use crate::image::sys::UnsafeImage; +use crate::image::ImageAccess; +use crate::image::ImageDimensions; +use crate::memory::DeviceMemoryAllocError; +use crate::sampler::Sampler; + +use crate::check_errors; +use crate::vk; +use crate::OomError; +use crate::SafeDeref; +use crate::VulkanObject; /// A safe image view that checks for validity and keeps its attached image alive. pub struct ImageView diff --git a/vulkano/src/instance/debug.rs b/vulkano/src/instance/debug.rs index d7ab40ccc9..101367a0d0 100644 --- a/vulkano/src/instance/debug.rs +++ b/vulkano/src/instance/debug.rs @@ -46,13 +46,13 @@ use std::panic; use std::ptr; use std::sync::Arc; -use instance::Instance; +use crate::instance::Instance; -use check_errors; -use vk; -use vk::{Bool32, DebugUtilsMessengerCallbackDataEXT}; -use Error; -use VulkanObject; +use crate::check_errors; +use crate::vk; +use crate::vk::{Bool32, DebugUtilsMessengerCallbackDataEXT}; +use crate::Error; +use crate::VulkanObject; /// Registration of a callback called by validation layers. /// diff --git a/vulkano/src/instance/extensions.rs b/vulkano/src/instance/extensions.rs index 2a458b8fd5..9f048b8def 100644 --- a/vulkano/src/instance/extensions.rs +++ b/vulkano/src/instance/extensions.rs @@ -14,11 +14,11 @@ use std::iter::FromIterator; use std::ptr; use std::str; -use check_errors; -use extensions::SupportedExtensionsError; -use instance::loader; -use instance::loader::LoadingError; -use vk; +use crate::check_errors; +use crate::extensions::SupportedExtensionsError; +use crate::instance::loader; +use crate::instance::loader::LoadingError; +use crate::vk; macro_rules! instance_extensions { ($sname:ident, $rawname:ident, $($ext:ident => $s:expr,)*) => ( @@ -170,7 +170,7 @@ pub struct Unbuildable(()); #[cfg(test)] mod tests { - use instance::{InstanceExtensions, RawInstanceExtensions}; + use crate::instance::{InstanceExtensions, RawInstanceExtensions}; #[test] fn empty_extensions() { diff --git a/vulkano/src/instance/instance.rs b/vulkano/src/instance/instance.rs index b3902922ca..c649a8ee9e 100644 --- a/vulkano/src/instance/instance.rs +++ b/vulkano/src/instance/instance.rs @@ -22,20 +22,20 @@ use std::ptr; use std::slice; use std::sync::Arc; -use check_errors; -use instance::limits::Limits; -use instance::loader; -use instance::loader::FunctionPointers; -use instance::loader::Loader; -use instance::loader::LoadingError; -use vk; -use Error; -use OomError; -use VulkanObject; - -use features::{Features, FeaturesFfi}; -use instance::{InstanceExtensions, RawInstanceExtensions}; -use version::Version; +use crate::check_errors; +use crate::instance::limits::Limits; +use crate::instance::loader; +use crate::instance::loader::FunctionPointers; +use crate::instance::loader::Loader; +use crate::instance::loader::LoadingError; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; + +use crate::features::{Features, FeaturesFfi}; +use crate::instance::{InstanceExtensions, RawInstanceExtensions}; +use crate::version::Version; /// An instance of a Vulkan context. This is the main object that should be created by an /// application before everything else. @@ -1413,7 +1413,7 @@ impl<'a> ExactSizeIterator for MemoryHeapsIter<'a> {} #[cfg(test)] mod tests { - use instance; + use crate::instance; #[test] fn create_instance() { diff --git a/vulkano/src/instance/layers.rs b/vulkano/src/instance/layers.rs index 9de42d1b05..d61e64a8ca 100644 --- a/vulkano/src/instance/layers.rs +++ b/vulkano/src/instance/layers.rs @@ -13,13 +13,13 @@ use std::fmt; use std::ptr; use std::vec::IntoIter; -use check_errors; -use instance::loader; -use instance::loader::LoadingError; -use version::Version; -use vk; -use Error; -use OomError; +use crate::check_errors; +use crate::instance::loader; +use crate::instance::loader::LoadingError; +use crate::version::Version; +use crate::vk; +use crate::Error; +use crate::OomError; /// Queries the list of layers that are available when creating an instance. /// @@ -244,7 +244,7 @@ impl ExactSizeIterator for LayersIterator {} #[cfg(test)] mod tests { - use instance; + use crate::instance; #[test] fn layers_list() { diff --git a/vulkano/src/instance/limits.rs b/vulkano/src/instance/limits.rs index 1a6802f526..fa65ddf1de 100644 --- a/vulkano/src/instance/limits.rs +++ b/vulkano/src/instance/limits.rs @@ -9,7 +9,7 @@ //! The `Limits` struct provides a nicer API around `vkPhysicalDeviceLimits`. -use vk; +use crate::vk; /// Limits of a physical device. pub struct Limits<'a> { diff --git a/vulkano/src/instance/loader.rs b/vulkano/src/instance/loader.rs index b9613dc0ec..b7b62d15e5 100644 --- a/vulkano/src/instance/loader.rs +++ b/vulkano/src/instance/loader.rs @@ -21,6 +21,9 @@ //! By default vulkano will use the `auto_loader()` function, which tries to automatically load //! a Vulkan implementation from the system. +use crate::vk; +use crate::SafeDeref; +use lazy_static::lazy_static; use shared_library; use std::error; use std::fmt; @@ -30,9 +33,6 @@ use std::os::raw::c_char; use std::os::raw::c_void; use std::path::Path; -use vk; -use SafeDeref; - /// Implemented on objects that grant access to a Vulkan implementation. pub unsafe trait Loader { /// Calls the `vkGetInstanceProcAddr` function. The parameters are the same. @@ -273,8 +273,8 @@ impl fmt::Display for LoadingError { #[cfg(test)] mod tests { - use instance::loader::DynamicLibraryLoader; - use instance::loader::LoadingError; + use crate::instance::loader::DynamicLibraryLoader; + use crate::instance::loader::LoadingError; #[test] fn dl_open_error() { diff --git a/vulkano/src/instance/mod.rs b/vulkano/src/instance/mod.rs index 1251bc35de..96ca99b69b 100644 --- a/vulkano/src/instance/mod.rs +++ b/vulkano/src/instance/mod.rs @@ -126,7 +126,7 @@ pub use self::layers::LayersIterator; pub use self::layers::LayersListError; pub use self::limits::Limits; pub use self::loader::LoadingError; -pub use version::Version; +pub use crate::version::Version; pub mod debug; pub mod loader; diff --git a/vulkano/src/lib.rs b/vulkano/src/lib.rs index 33dbd2d1a3..a98b5ec4c5 100644 --- a/vulkano/src/lib.rs +++ b/vulkano/src/lib.rs @@ -62,29 +62,26 @@ #![allow(dead_code)] // TODO: remove #![allow(unused_variables)] // TODO: remove -extern crate crossbeam; -extern crate fnv; -#[macro_use] -extern crate lazy_static; -pub extern crate half; -extern crate parking_lot; -extern crate shared_library; -extern crate smallvec; extern crate vk_sys as vk; +pub use half; +use std::error; +use std::fmt; +use std::ops::Deref; +use std::sync::Arc; +use std::sync::MutexGuard; + #[macro_use] mod tests; - #[macro_use] mod extensions; -mod features; -mod version; - pub mod buffer; pub mod command_buffer; pub mod descriptor; pub mod device; +mod features; pub mod format; +mod version; #[macro_use] pub mod framebuffer; pub mod image; @@ -96,12 +93,6 @@ pub mod sampler; pub mod swapchain; pub mod sync; -use std::error; -use std::fmt; -use std::ops::Deref; -use std::sync::Arc; -use std::sync::MutexGuard; - /// Alternative to the `Deref` trait. Contrary to `Deref`, must always return the same object. pub unsafe trait SafeDeref: Deref {} unsafe impl<'a, T: ?Sized> SafeDeref for &'a T {} diff --git a/vulkano/src/memory/device_memory.rs b/vulkano/src/memory/device_memory.rs index 8a8d1fd80a..2acf2ab76e 100644 --- a/vulkano/src/memory/device_memory.rs +++ b/vulkano/src/memory/device_memory.rs @@ -22,17 +22,17 @@ use std::fs::File; #[cfg(target_os = "linux")] use std::os::unix::io::FromRawFd; -use check_errors; -use device::Device; -use device::DeviceOwned; -use instance::MemoryType; -use memory::Content; -use memory::DedicatedAlloc; -use memory::ExternalMemoryHandleType; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::instance::MemoryType; +use crate::memory::Content; +use crate::memory::DedicatedAlloc; +use crate::memory::ExternalMemoryHandleType; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Represents memory that has been allocated. /// @@ -794,9 +794,9 @@ impl From for DeviceMemoryAllocError { #[cfg(test)] mod tests { - use memory::DeviceMemory; - use memory::DeviceMemoryAllocError; - use OomError; + use crate::memory::DeviceMemory; + use crate::memory::DeviceMemoryAllocError; + use crate::OomError; #[test] fn create() { diff --git a/vulkano/src/memory/external_memory_handle_type.rs b/vulkano/src/memory/external_memory_handle_type.rs index 4b968f0410..2062ee3ca9 100644 --- a/vulkano/src/memory/external_memory_handle_type.rs +++ b/vulkano/src/memory/external_memory_handle_type.rs @@ -8,7 +8,7 @@ // according to those terms. use std::ops::BitOr; -use vk; +use crate::vk; /// Describes the handle type used for Vulkan external memory apis. This is **not** just a /// suggestion. Check out vkExternalMemoryHandleTypeFlagBits in the Vulkan spec. diff --git a/vulkano/src/memory/mod.rs b/vulkano/src/memory/mod.rs index 9896ea6230..234b720bb1 100644 --- a/vulkano/src/memory/mod.rs +++ b/vulkano/src/memory/mod.rs @@ -89,9 +89,9 @@ use std::mem; use std::os::raw::c_void; use std::slice; -use buffer::sys::UnsafeBuffer; -use image::sys::UnsafeImage; -use vk; +use crate::buffer::sys::UnsafeBuffer; +use crate::image::sys::UnsafeImage; +use crate::vk; pub use self::device_memory::CpuAccess; pub use self::device_memory::DeviceMemory; @@ -165,7 +165,7 @@ pub unsafe trait Content { fn ref_from_ptr<'a>(ptr: *mut c_void, size: usize) -> Option<*mut Self>; /// Returns true if the size is suitable to store a type like this. - fn is_size_suitable(usize) -> bool; + fn is_size_suitable(size: usize) -> bool; /// Returns the size of an individual element. fn indiv_size() -> usize; diff --git a/vulkano/src/memory/pool/host_visible.rs b/vulkano/src/memory/pool/host_visible.rs index 5240fdf19d..fa48605bfc 100644 --- a/vulkano/src/memory/pool/host_visible.rs +++ b/vulkano/src/memory/pool/host_visible.rs @@ -12,12 +12,12 @@ use std::ops::Range; use std::sync::Arc; use std::sync::Mutex; -use device::Device; -use instance::Instance; -use instance::MemoryType; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; -use memory::MappedDeviceMemory; +use crate::device::Device; +use crate::instance::Instance; +use crate::instance::MemoryType; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; +use crate::memory::MappedDeviceMemory; /// Memory pool that operates on a given memory type. #[derive(Debug)] diff --git a/vulkano/src/memory/pool/mod.rs b/vulkano/src/memory/pool/mod.rs index ab2c33aad3..83853c285f 100644 --- a/vulkano/src/memory/pool/mod.rs +++ b/vulkano/src/memory/pool/mod.rs @@ -7,13 +7,13 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use device::{Device, DeviceOwned}; -use instance::MemoryType; -use memory::DedicatedAlloc; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; -use memory::MappedDeviceMemory; -use memory::MemoryRequirements; +use crate::device::{Device, DeviceOwned}; +use crate::instance::MemoryType; +use crate::memory::DedicatedAlloc; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; +use crate::memory::MappedDeviceMemory; +use crate::memory::MemoryRequirements; pub use self::host_visible::StdHostVisibleMemoryTypePool; pub use self::host_visible::StdHostVisibleMemoryTypePoolAlloc; diff --git a/vulkano/src/memory/pool/non_host_visible.rs b/vulkano/src/memory/pool/non_host_visible.rs index 8011e568e7..b7ebb5a38c 100644 --- a/vulkano/src/memory/pool/non_host_visible.rs +++ b/vulkano/src/memory/pool/non_host_visible.rs @@ -12,11 +12,11 @@ use std::ops::Range; use std::sync::Arc; use std::sync::Mutex; -use device::Device; -use instance::Instance; -use instance::MemoryType; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; +use crate::device::Device; +use crate::instance::Instance; +use crate::instance::MemoryType; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; /// Memory pool that operates on a given memory type. #[derive(Debug)] diff --git a/vulkano/src/memory/pool/pool.rs b/vulkano/src/memory/pool/pool.rs index dceaefbdab..a1757896f7 100644 --- a/vulkano/src/memory/pool/pool.rs +++ b/vulkano/src/memory/pool/pool.rs @@ -14,20 +14,20 @@ use std::hash::BuildHasherDefault; use std::sync::Arc; use std::sync::Mutex; -use device::Device; -use device::DeviceOwned; -use instance::MemoryType; -use memory::pool::AllocLayout; -use memory::pool::MappingRequirement; -use memory::pool::MemoryPool; -use memory::pool::MemoryPoolAlloc; -use memory::pool::StdHostVisibleMemoryTypePool; -use memory::pool::StdHostVisibleMemoryTypePoolAlloc; -use memory::pool::StdNonHostVisibleMemoryTypePool; -use memory::pool::StdNonHostVisibleMemoryTypePoolAlloc; -use memory::DeviceMemory; -use memory::DeviceMemoryAllocError; -use memory::MappedDeviceMemory; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::instance::MemoryType; +use crate::memory::pool::AllocLayout; +use crate::memory::pool::MappingRequirement; +use crate::memory::pool::MemoryPool; +use crate::memory::pool::MemoryPoolAlloc; +use crate::memory::pool::StdHostVisibleMemoryTypePool; +use crate::memory::pool::StdHostVisibleMemoryTypePoolAlloc; +use crate::memory::pool::StdNonHostVisibleMemoryTypePool; +use crate::memory::pool::StdNonHostVisibleMemoryTypePoolAlloc; +use crate::memory::DeviceMemory; +use crate::memory::DeviceMemoryAllocError; +use crate::memory::MappedDeviceMemory; #[derive(Debug)] pub struct StdMemoryPool { diff --git a/vulkano/src/pipeline/blend.rs b/vulkano/src/pipeline/blend.rs index 7624ac9bd4..78c27ea579 100644 --- a/vulkano/src/pipeline/blend.rs +++ b/vulkano/src/pipeline/blend.rs @@ -22,7 +22,7 @@ //! will take precedence if it is activated, otherwise the blending operation is applied. //! -use vk; +use crate::vk; /// Describes how the color output of the fragment shader is written to the attachment. See the /// documentation of the `blend` module for more info. diff --git a/vulkano/src/pipeline/cache.rs b/vulkano/src/pipeline/cache.rs index 20be313524..eb0a096e80 100644 --- a/vulkano/src/pipeline/cache.rs +++ b/vulkano/src/pipeline/cache.rs @@ -25,12 +25,12 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use device::Device; +use crate::device::Device; -use check_errors; -use vk; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; /// Opaque cache that contains pipeline objects. /// @@ -252,12 +252,12 @@ impl Drop for PipelineCache { mod tests { use std::{ffi::CStr, sync::Arc}; - use descriptor::descriptor::DescriptorDesc; - use descriptor::pipeline_layout::PipelineLayoutDesc; - use descriptor::pipeline_layout::PipelineLayoutDescPcRange; - use pipeline::cache::PipelineCache; - use pipeline::shader::ShaderModule; - use pipeline::ComputePipeline; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::pipeline_layout::PipelineLayoutDesc; + use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; + use crate::pipeline::cache::PipelineCache; + use crate::pipeline::shader::ShaderModule; + use crate::pipeline::ComputePipeline; #[test] fn merge_self_forbidden() { diff --git a/vulkano/src/pipeline/compute_pipeline.rs b/vulkano/src/pipeline/compute_pipeline.rs index d14d7ecc4d..613daabe05 100644 --- a/vulkano/src/pipeline/compute_pipeline.rs +++ b/vulkano/src/pipeline/compute_pipeline.rs @@ -15,28 +15,28 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use descriptor::pipeline_layout::PipelineLayout; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use descriptor::pipeline_layout::PipelineLayoutCreationError; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; -use descriptor::pipeline_layout::PipelineLayoutNotSupersetError; -use descriptor::pipeline_layout::PipelineLayoutSuperset; -use descriptor::pipeline_layout::PipelineLayoutSys; -use pipeline::cache::PipelineCache; -use pipeline::shader::EntryPointAbstract; -use pipeline::shader::SpecializationConstants; - -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use Error; -use OomError; -use SafeDeref; -use VulkanObject; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::descriptor::pipeline_layout::PipelineLayout; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::descriptor::pipeline_layout::PipelineLayoutCreationError; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::pipeline_layout::PipelineLayoutNotSupersetError; +use crate::descriptor::pipeline_layout::PipelineLayoutSuperset; +use crate::descriptor::pipeline_layout::PipelineLayoutSys; +use crate::pipeline::cache::PipelineCache; +use crate::pipeline::shader::EntryPointAbstract; +use crate::pipeline::shader::SpecializationConstants; + +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SafeDeref; +use crate::VulkanObject; /// A pipeline object that describes to the Vulkan implementation how it should perform compute /// operations. @@ -406,25 +406,25 @@ impl From for ComputePipelineCreationError { #[cfg(test)] mod tests { - use buffer::BufferUsage; - use buffer::CpuAccessibleBuffer; - use command_buffer::AutoCommandBufferBuilder; - use descriptor::descriptor::DescriptorBufferDesc; - use descriptor::descriptor::DescriptorDesc; - use descriptor::descriptor::DescriptorDescTy; - use descriptor::descriptor::ShaderStages; - use descriptor::descriptor_set::PersistentDescriptorSet; - use descriptor::pipeline_layout::PipelineLayoutAbstract; - use descriptor::pipeline_layout::PipelineLayoutDesc; - use descriptor::pipeline_layout::PipelineLayoutDescPcRange; - use pipeline::shader::ShaderModule; - use pipeline::shader::SpecializationConstants; - use pipeline::shader::SpecializationMapEntry; - use pipeline::ComputePipeline; + use crate::buffer::BufferUsage; + use crate::buffer::CpuAccessibleBuffer; + use crate::command_buffer::AutoCommandBufferBuilder; + use crate::descriptor::descriptor::DescriptorBufferDesc; + use crate::descriptor::descriptor::DescriptorDesc; + use crate::descriptor::descriptor::DescriptorDescTy; + use crate::descriptor::descriptor::ShaderStages; + use crate::descriptor::descriptor_set::PersistentDescriptorSet; + use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; + use crate::descriptor::pipeline_layout::PipelineLayoutDesc; + use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; + use crate::pipeline::shader::ShaderModule; + use crate::pipeline::shader::SpecializationConstants; + use crate::pipeline::shader::SpecializationMapEntry; + use crate::pipeline::ComputePipeline; use std::ffi::CStr; use std::sync::Arc; - use sync::now; - use sync::GpuFuture; + use crate::sync::now; + use crate::sync::GpuFuture; // TODO: test for basic creation // TODO: test for pipeline layout error diff --git a/vulkano/src/pipeline/depth_stencil.rs b/vulkano/src/pipeline/depth_stencil.rs index 8a08a86120..b1473f7559 100644 --- a/vulkano/src/pipeline/depth_stencil.rs +++ b/vulkano/src/pipeline/depth_stencil.rs @@ -22,7 +22,7 @@ use std::ops::Range; use std::u32; -use vk; +use crate::vk; /// Configuration of the depth and stencil tests. #[derive(Debug, Clone)] diff --git a/vulkano/src/pipeline/graphics_pipeline/builder.rs b/vulkano/src/pipeline/graphics_pipeline/builder.rs index 5e84cdc9f6..a72aa27792 100644 --- a/vulkano/src/pipeline/graphics_pipeline/builder.rs +++ b/vulkano/src/pipeline/graphics_pipeline/builder.rs @@ -18,46 +18,46 @@ use std::ptr; use std::sync::Arc; use std::u32; -use descriptor::pipeline_layout::PipelineLayoutAbstract; -use device::Device; -use framebuffer::RenderPassAbstract; -use framebuffer::Subpass; -use pipeline::blend::AttachmentBlend; -use pipeline::blend::AttachmentsBlend; -use pipeline::blend::Blend; -use pipeline::blend::LogicOp; -use pipeline::cache::PipelineCache; -use pipeline::depth_stencil::Compare; -use pipeline::depth_stencil::DepthBounds; -use pipeline::depth_stencil::DepthStencil; -use pipeline::graphics_pipeline::GraphicsPipeline; -use pipeline::graphics_pipeline::GraphicsPipelineCreationError; -use pipeline::graphics_pipeline::Inner as GraphicsPipelineInner; -use pipeline::input_assembly::PrimitiveTopology; -use pipeline::raster::CullMode; -use pipeline::raster::DepthBiasControl; -use pipeline::raster::FrontFace; -use pipeline::raster::PolygonMode; -use pipeline::raster::Rasterization; -use pipeline::shader::EmptyEntryPointDummy; -use pipeline::shader::GraphicsEntryPointAbstract; -use pipeline::shader::GraphicsShaderType; -use pipeline::shader::ShaderInterfaceDefMatch; -use pipeline::shader::SpecializationConstants; -use pipeline::vertex::BufferlessDefinition; -use pipeline::vertex::SingleBufferDefinition; -use pipeline::vertex::VertexDefinition; -use pipeline::viewport::Scissor; -use pipeline::viewport::Viewport; -use pipeline::viewport::ViewportsState; - -use check_errors; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescTweaks; -use descriptor::pipeline_layout::PipelineLayoutSuperset; -use framebuffer::RenderPassSubpassInterface; -use vk; -use VulkanObject; +use crate::descriptor::pipeline_layout::PipelineLayoutAbstract; +use crate::device::Device; +use crate::framebuffer::RenderPassAbstract; +use crate::framebuffer::Subpass; +use crate::pipeline::blend::AttachmentBlend; +use crate::pipeline::blend::AttachmentsBlend; +use crate::pipeline::blend::Blend; +use crate::pipeline::blend::LogicOp; +use crate::pipeline::cache::PipelineCache; +use crate::pipeline::depth_stencil::Compare; +use crate::pipeline::depth_stencil::DepthBounds; +use crate::pipeline::depth_stencil::DepthStencil; +use crate::pipeline::graphics_pipeline::GraphicsPipeline; +use crate::pipeline::graphics_pipeline::GraphicsPipelineCreationError; +use crate::pipeline::graphics_pipeline::Inner as GraphicsPipelineInner; +use crate::pipeline::input_assembly::PrimitiveTopology; +use crate::pipeline::raster::CullMode; +use crate::pipeline::raster::DepthBiasControl; +use crate::pipeline::raster::FrontFace; +use crate::pipeline::raster::PolygonMode; +use crate::pipeline::raster::Rasterization; +use crate::pipeline::shader::EmptyEntryPointDummy; +use crate::pipeline::shader::GraphicsEntryPointAbstract; +use crate::pipeline::shader::GraphicsShaderType; +use crate::pipeline::shader::ShaderInterfaceDefMatch; +use crate::pipeline::shader::SpecializationConstants; +use crate::pipeline::vertex::BufferlessDefinition; +use crate::pipeline::vertex::SingleBufferDefinition; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::viewport::Scissor; +use crate::pipeline::viewport::Viewport; +use crate::pipeline::viewport::ViewportsState; + +use crate::check_errors; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescTweaks; +use crate::descriptor::pipeline_layout::PipelineLayoutSuperset; +use crate::framebuffer::RenderPassSubpassInterface; +use crate::vk; +use crate::VulkanObject; /// Prototype for a `GraphicsPipeline`. // TODO: we can optimize this by filling directly the raw vk structs diff --git a/vulkano/src/pipeline/graphics_pipeline/creation_error.rs b/vulkano/src/pipeline/graphics_pipeline/creation_error.rs index 452973bb48..c1d31576e6 100644 --- a/vulkano/src/pipeline/graphics_pipeline/creation_error.rs +++ b/vulkano/src/pipeline/graphics_pipeline/creation_error.rs @@ -11,12 +11,12 @@ use std::error; use std::fmt; use std::u32; -use descriptor::pipeline_layout::PipelineLayoutNotSupersetError; -use pipeline::input_assembly::PrimitiveTopology; -use pipeline::shader::ShaderInterfaceMismatchError; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use Error; -use OomError; +use crate::descriptor::pipeline_layout::PipelineLayoutNotSupersetError; +use crate::pipeline::input_assembly::PrimitiveTopology; +use crate::pipeline::shader::ShaderInterfaceMismatchError; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::Error; +use crate::OomError; /// Error that can happen when creating a graphics pipeline. #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/vulkano/src/pipeline/graphics_pipeline/mod.rs b/vulkano/src/pipeline/graphics_pipeline/mod.rs index 0ae971542a..5eac56be99 100644 --- a/vulkano/src/pipeline/graphics_pipeline/mod.rs +++ b/vulkano/src/pipeline/graphics_pipeline/mod.rs @@ -15,32 +15,32 @@ use std::ptr; use std::sync::Arc; use std::u32; -use buffer::BufferAccess; -use descriptor::descriptor::DescriptorDesc; -use descriptor::descriptor_set::UnsafeDescriptorSetLayout; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use descriptor::pipeline_layout::PipelineLayoutDescPcRange; -use descriptor::pipeline_layout::PipelineLayoutSys; -use descriptor::PipelineLayoutAbstract; -use device::Device; -use device::DeviceOwned; -use format::ClearValue; -use framebuffer::AttachmentDescription; -use framebuffer::PassDependencyDescription; -use framebuffer::PassDescription; -use framebuffer::RenderPassAbstract; -use framebuffer::RenderPassDesc; -use framebuffer::RenderPassDescClearValues; -use framebuffer::RenderPassSys; -use framebuffer::Subpass; -use pipeline::shader::EmptyEntryPointDummy; -use pipeline::vertex::BufferlessDefinition; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; -use vk; -use SafeDeref; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::descriptor::descriptor::DescriptorDesc; +use crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDescPcRange; +use crate::descriptor::pipeline_layout::PipelineLayoutSys; +use crate::descriptor::PipelineLayoutAbstract; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::format::ClearValue; +use crate::framebuffer::AttachmentDescription; +use crate::framebuffer::PassDependencyDescription; +use crate::framebuffer::PassDescription; +use crate::framebuffer::RenderPassAbstract; +use crate::framebuffer::RenderPassDesc; +use crate::framebuffer::RenderPassDescClearValues; +use crate::framebuffer::RenderPassSys; +use crate::framebuffer::Subpass; +use crate::pipeline::shader::EmptyEntryPointDummy; +use crate::pipeline::vertex::BufferlessDefinition; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; +use crate::vk; +use crate::SafeDeref; +use crate::VulkanObject; pub use self::builder::GraphicsPipelineBuilder; pub use self::creation_error::GraphicsPipelineCreationError; diff --git a/vulkano/src/pipeline/input_assembly.rs b/vulkano/src/pipeline/input_assembly.rs index e4f0833b92..4c7701aeb8 100644 --- a/vulkano/src/pipeline/input_assembly.rs +++ b/vulkano/src/pipeline/input_assembly.rs @@ -12,7 +12,7 @@ //! The input assembly is the stage where lists of vertices are turned into primitives. //! -use vk; +use crate::vk; /// How the input assembly stage should behave. #[derive(Copy, Clone, Debug)] diff --git a/vulkano/src/pipeline/raster.rs b/vulkano/src/pipeline/raster.rs index 1abe429780..17bfea0fb8 100644 --- a/vulkano/src/pipeline/raster.rs +++ b/vulkano/src/pipeline/raster.rs @@ -13,7 +13,7 @@ //! of pixels or samples. //! -use vk; +use crate::vk; /// State of the rasterizer. #[derive(Clone, Debug)] diff --git a/vulkano/src/pipeline/shader.rs b/vulkano/src/pipeline/shader.rs index 6ef7d3b12f..e9ba7bce6d 100644 --- a/vulkano/src/pipeline/shader.rs +++ b/vulkano/src/pipeline/shader.rs @@ -30,16 +30,16 @@ use std::ops::Range; use std::ptr; use std::sync::Arc; -use descriptor::pipeline_layout::EmptyPipelineDesc; -use descriptor::pipeline_layout::PipelineLayoutDesc; -use format::Format; -use pipeline::input_assembly::PrimitiveTopology; - -use check_errors; -use device::Device; -use vk; -use OomError; -use VulkanObject; +use crate::descriptor::pipeline_layout::EmptyPipelineDesc; +use crate::descriptor::pipeline_layout::PipelineLayoutDesc; +use crate::format::Format; +use crate::pipeline::input_assembly::PrimitiveTopology; + +use crate::check_errors; +use crate::device::Device; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; /// Contains SPIR-V code with one or more entry points. /// diff --git a/vulkano/src/pipeline/vertex/bufferless.rs b/vulkano/src/pipeline/vertex/bufferless.rs index b036903c8e..31ee1775fd 100644 --- a/vulkano/src/pipeline/vertex/bufferless.rs +++ b/vulkano/src/pipeline/vertex/bufferless.rs @@ -9,12 +9,12 @@ use std::iter; -use buffer::BufferAccess; -use pipeline::vertex::AttributeInfo; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::InputRate; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; +use crate::buffer::BufferAccess; +use crate::pipeline::vertex::AttributeInfo; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::InputRate; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; /// Implementation of `VertexDefinition` for drawing with no buffers at all. /// diff --git a/vulkano/src/pipeline/vertex/definition.rs b/vulkano/src/pipeline/vertex/definition.rs index fdbc93bdb5..fb96c1d2d0 100644 --- a/vulkano/src/pipeline/vertex/definition.rs +++ b/vulkano/src/pipeline/vertex/definition.rs @@ -11,11 +11,11 @@ use std::error; use std::fmt; use std::sync::Arc; -use buffer::BufferAccess; -use format::Format; -use pipeline::vertex::VertexMemberTy; -use vk; -use SafeDeref; +use crate::buffer::BufferAccess; +use crate::format::Format; +use crate::pipeline::vertex::VertexMemberTy; +use crate::vk; +use crate::SafeDeref; /// Trait for types that describe the definition of the vertex input used by a graphics pipeline. pub unsafe trait VertexDefinition: @@ -117,7 +117,7 @@ pub unsafe trait VertexSource { // TODO: return error if problem // TODO: better than a Vec // TODO: return a struct instead - fn decode(&self, L) -> (Vec>, usize, usize); + fn decode(&self, list: L) -> (Vec>, usize, usize); } unsafe impl VertexSource for T diff --git a/vulkano/src/pipeline/vertex/impl_vertex.rs b/vulkano/src/pipeline/vertex/impl_vertex.rs index 52e6e5978f..7694b96208 100644 --- a/vulkano/src/pipeline/vertex/impl_vertex.rs +++ b/vulkano/src/pipeline/vertex/impl_vertex.rs @@ -7,7 +7,7 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use pipeline::vertex::VertexMemberTy; +use crate::pipeline::vertex::VertexMemberTy; /// Implements the `Vertex` trait on a struct. ///# Example diff --git a/vulkano/src/pipeline/vertex/instance_buffer.rs b/vulkano/src/pipeline/vertex/instance_buffer.rs index d1675be622..c620149d3a 100644 --- a/vulkano/src/pipeline/vertex/instance_buffer.rs +++ b/vulkano/src/pipeline/vertex/instance_buffer.rs @@ -13,15 +13,15 @@ use std::option::IntoIter as OptionIntoIter; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use pipeline::shader::ShaderInterfaceDef; -use pipeline::vertex::AttributeInfo; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::InputRate; -use pipeline::vertex::Vertex; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::pipeline::shader::ShaderInterfaceDef; +use crate::pipeline::vertex::AttributeInfo; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::InputRate; +use crate::pipeline::vertex::Vertex; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; /// Same as `SingleBufferDefinition` but advances by instance. pub struct SingleInstanceBufferDefinition(pub PhantomData); diff --git a/vulkano/src/pipeline/vertex/one_one.rs b/vulkano/src/pipeline/vertex/one_one.rs index 2ed5c966be..7ba0aacebc 100644 --- a/vulkano/src/pipeline/vertex/one_one.rs +++ b/vulkano/src/pipeline/vertex/one_one.rs @@ -12,15 +12,15 @@ use std::mem; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use pipeline::shader::ShaderInterfaceDef; -use pipeline::vertex::AttributeInfo; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::InputRate; -use pipeline::vertex::Vertex; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::pipeline::shader::ShaderInterfaceDef; +use crate::pipeline::vertex::AttributeInfo; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::InputRate; +use crate::pipeline::vertex::Vertex; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; /// Unstable. // TODO: bad way to do things diff --git a/vulkano/src/pipeline/vertex/single.rs b/vulkano/src/pipeline/vertex/single.rs index 4a64ec7239..341220b05f 100644 --- a/vulkano/src/pipeline/vertex/single.rs +++ b/vulkano/src/pipeline/vertex/single.rs @@ -13,15 +13,15 @@ use std::option::IntoIter as OptionIntoIter; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use pipeline::shader::ShaderInterfaceDef; -use pipeline::vertex::AttributeInfo; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::InputRate; -use pipeline::vertex::Vertex; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::pipeline::shader::ShaderInterfaceDef; +use crate::pipeline::vertex::AttributeInfo; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::InputRate; +use crate::pipeline::vertex::Vertex; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; /// Implementation of `VertexDefinition` for a single vertex buffer. pub struct SingleBufferDefinition(pub PhantomData); diff --git a/vulkano/src/pipeline/vertex/two.rs b/vulkano/src/pipeline/vertex/two.rs index f3296beddf..7cbfdc5f6b 100644 --- a/vulkano/src/pipeline/vertex/two.rs +++ b/vulkano/src/pipeline/vertex/two.rs @@ -12,15 +12,15 @@ use std::mem; use std::sync::Arc; use std::vec::IntoIter as VecIntoIter; -use buffer::BufferAccess; -use buffer::TypedBufferAccess; -use pipeline::shader::ShaderInterfaceDef; -use pipeline::vertex::AttributeInfo; -use pipeline::vertex::IncompatibleVertexDefinitionError; -use pipeline::vertex::InputRate; -use pipeline::vertex::Vertex; -use pipeline::vertex::VertexDefinition; -use pipeline::vertex::VertexSource; +use crate::buffer::BufferAccess; +use crate::buffer::TypedBufferAccess; +use crate::pipeline::shader::ShaderInterfaceDef; +use crate::pipeline::vertex::AttributeInfo; +use crate::pipeline::vertex::IncompatibleVertexDefinitionError; +use crate::pipeline::vertex::InputRate; +use crate::pipeline::vertex::Vertex; +use crate::pipeline::vertex::VertexDefinition; +use crate::pipeline::vertex::VertexSource; /// Unstable. // TODO: shouldn't be just `Two` but `Multi` diff --git a/vulkano/src/pipeline/vertex/vertex.rs b/vulkano/src/pipeline/vertex/vertex.rs index 794630c4f0..8ea339c4af 100644 --- a/vulkano/src/pipeline/vertex/vertex.rs +++ b/vulkano/src/pipeline/vertex/vertex.rs @@ -7,7 +7,7 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use format::Format; +use crate::format::Format; /// Describes an individual `Vertex`. In other words a collection of attributes that can be read /// from a vertex shader. diff --git a/vulkano/src/pipeline/viewport.rs b/vulkano/src/pipeline/viewport.rs index c1f7e314f2..f3877de6bd 100644 --- a/vulkano/src/pipeline/viewport.rs +++ b/vulkano/src/pipeline/viewport.rs @@ -49,7 +49,7 @@ //! use std::ops::Range; -use vk; +use crate::vk; /// List of viewports and scissors that are used when creating a graphics pipeline object. /// diff --git a/vulkano/src/query/mod.rs b/vulkano/src/query/mod.rs index ace875c491..af9fb3b734 100644 --- a/vulkano/src/query/mod.rs +++ b/vulkano/src/query/mod.rs @@ -19,14 +19,14 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use device::Device; -use device::DeviceOwned; +use crate::device::Device; +use crate::device::DeviceOwned; -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; pub struct UnsafeQueryPool { pool: vk::QueryPool, @@ -364,11 +364,11 @@ unsafe impl DeviceOwned for OcclusionQueriesPool { #[cfg(test)] mod tests { - use query::OcclusionQueriesPool; - use query::QueryPipelineStatisticFlags; - use query::QueryPoolCreationError; - use query::QueryType; - use query::UnsafeQueryPool; + use crate::query::OcclusionQueriesPool; + use crate::query::QueryPipelineStatisticFlags; + use crate::query::QueryPoolCreationError; + use crate::query::QueryType; + use crate::query::UnsafeQueryPool; #[test] fn occlusion_create() { diff --git a/vulkano/src/sampler.rs b/vulkano/src/sampler.rs index 48ca137ac8..e2a6465982 100644 --- a/vulkano/src/sampler.rs +++ b/vulkano/src/sampler.rs @@ -68,15 +68,15 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; -pub use pipeline::depth_stencil::Compare; +pub use crate::pipeline::depth_stencil::Compare; /// Describes how to retrieve data from an image within a shader. pub struct Sampler { @@ -776,7 +776,7 @@ impl From for SamplerCreationError { #[cfg(test)] mod tests { - use sampler; + use crate::sampler; #[test] fn create_regular() { diff --git a/vulkano/src/swapchain/capabilities.rs b/vulkano/src/swapchain/capabilities.rs index 26fdddbc57..e891f00fbd 100644 --- a/vulkano/src/swapchain/capabilities.rs +++ b/vulkano/src/swapchain/capabilities.rs @@ -7,9 +7,9 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use format::Format; -use image::ImageUsage; -use vk; +use crate::format::Format; +use crate::image::ImageUsage; +use crate::vk; /// The capabilities of a surface when used by a physical device. /// diff --git a/vulkano/src/swapchain/display.rs b/vulkano/src/swapchain/display.rs index 66da8eb971..baf03ddd51 100644 --- a/vulkano/src/swapchain/display.rs +++ b/vulkano/src/swapchain/display.rs @@ -33,15 +33,15 @@ use std::ptr; use std::sync::Arc; use std::vec::IntoIter; -use instance::Instance; -use instance::PhysicalDevice; -use swapchain::capabilities; -use swapchain::SupportedSurfaceTransforms; - -use check_errors; -use vk; -use OomError; -use VulkanObject; +use crate::instance::Instance; +use crate::instance::PhysicalDevice; +use crate::swapchain::capabilities; +use crate::swapchain::SupportedSurfaceTransforms; + +use crate::check_errors; +use crate::vk; +use crate::OomError; +use crate::VulkanObject; // TODO: extract this to a `display` module and solve the visibility problems diff --git a/vulkano/src/swapchain/present_region.rs b/vulkano/src/swapchain/present_region.rs index 4f62902d7c..a0c1c558df 100644 --- a/vulkano/src/swapchain/present_region.rs +++ b/vulkano/src/swapchain/present_region.rs @@ -7,8 +7,8 @@ // notice may not be copied, modified, or distributed except // according to those terms. -use swapchain::Swapchain; -use vk; +use crate::swapchain::Swapchain; +use crate::vk; /// Represents a region on an image. /// diff --git a/vulkano/src/swapchain/surface.rs b/vulkano/src/swapchain/surface.rs index 7b0f82df57..1a92c187eb 100644 --- a/vulkano/src/swapchain/surface.rs +++ b/vulkano/src/swapchain/surface.rs @@ -15,22 +15,22 @@ use std::ptr; use std::sync::atomic::AtomicBool; use std::sync::Arc; -use format::Format; -use image::ImageUsage; -use instance::Instance; -use instance::PhysicalDevice; -use instance::QueueFamily; -use swapchain::capabilities; -use swapchain::display::DisplayMode; -use swapchain::display::DisplayPlane; -use swapchain::Capabilities; -use swapchain::SurfaceSwapchainLock; - -use check_errors; -use vk; -use Error; -use OomError; -use VulkanObject; +use crate::format::Format; +use crate::image::ImageUsage; +use crate::instance::Instance; +use crate::instance::PhysicalDevice; +use crate::instance::QueueFamily; +use crate::swapchain::capabilities; +use crate::swapchain::display::DisplayMode; +use crate::swapchain::display::DisplayPlane; +use crate::swapchain::Capabilities; +use crate::swapchain::SurfaceSwapchainLock; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::VulkanObject; /// Represents a surface on the screen. /// @@ -811,8 +811,8 @@ impl From for CapabilitiesError { #[cfg(test)] mod tests { use std::ptr; - use swapchain::Surface; - use swapchain::SurfaceCreationError; + use crate::swapchain::Surface; + use crate::swapchain::SurfaceCreationError; #[test] fn khr_win32_surface_ext_missing() { diff --git a/vulkano/src/swapchain/swapchain.rs b/vulkano/src/swapchain/swapchain.rs index a8029a1404..d7aab05c19 100644 --- a/vulkano/src/swapchain/swapchain.rs +++ b/vulkano/src/swapchain/swapchain.rs @@ -18,50 +18,50 @@ use std::sync::Arc; use std::sync::Mutex; use std::time::Duration; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use command_buffer::submit::SubmitPresentBuilder; -use command_buffer::submit::SubmitPresentError; -use command_buffer::submit::SubmitSemaphoresWaitBuilder; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use format::Format; -use format::FormatDesc; -use image::swapchain::SwapchainImage; -use image::sys::UnsafeImage; -use image::ImageAccess; -use image::ImageCreateFlags; -use image::ImageDimensions; -use image::ImageInner; -use image::ImageLayout; -use image::ImageTiling; -use image::ImageType; -use image::ImageUsage; -use swapchain::CapabilitiesError; -use swapchain::ColorSpace; -use swapchain::CompositeAlpha; -use swapchain::PresentMode; -use swapchain::PresentRegion; -use swapchain::Surface; -use swapchain::SurfaceSwapchainLock; -use swapchain::SurfaceTransform; -use sync::AccessCheckError; -use sync::AccessError; -use sync::AccessFlagBits; -use sync::Fence; -use sync::FlushError; -use sync::GpuFuture; -use sync::PipelineStages; -use sync::Semaphore; -use sync::SharingMode; - -use check_errors; -use vk; -use Error; -use OomError; -use Success; -use VulkanObject; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::command_buffer::submit::SubmitPresentBuilder; +use crate::command_buffer::submit::SubmitPresentError; +use crate::command_buffer::submit::SubmitSemaphoresWaitBuilder; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::format::Format; +use crate::format::FormatDesc; +use crate::image::swapchain::SwapchainImage; +use crate::image::sys::UnsafeImage; +use crate::image::ImageAccess; +use crate::image::ImageCreateFlags; +use crate::image::ImageDimensions; +use crate::image::ImageInner; +use crate::image::ImageLayout; +use crate::image::ImageTiling; +use crate::image::ImageType; +use crate::image::ImageUsage; +use crate::swapchain::CapabilitiesError; +use crate::swapchain::ColorSpace; +use crate::swapchain::CompositeAlpha; +use crate::swapchain::PresentMode; +use crate::swapchain::PresentRegion; +use crate::swapchain::Surface; +use crate::swapchain::SurfaceSwapchainLock; +use crate::swapchain::SurfaceTransform; +use crate::sync::AccessCheckError; +use crate::sync::AccessError; +use crate::sync::AccessFlagBits; +use crate::sync::Fence; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; +use crate::sync::Semaphore; +use crate::sync::SharingMode; + +use crate::check_errors; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::Success; +use crate::VulkanObject; /// The way fullscreen exclusivity is handled. #[derive(Copy, Clone, Debug, PartialEq, Eq)] diff --git a/vulkano/src/sync/event.rs b/vulkano/src/sync/event.rs index 0a65b2e3fa..8d142f66e2 100644 --- a/vulkano/src/sync/event.rs +++ b/vulkano/src/sync/event.rs @@ -11,13 +11,13 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use OomError; -use Success; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::OomError; +use crate::Success; +use crate::VulkanObject; /// Used to block the GPU execution until an event on the CPU occurs. /// @@ -191,8 +191,8 @@ impl Drop for Event { #[cfg(test)] mod tests { - use sync::Event; - use VulkanObject; + use crate::sync::Event; + use crate::VulkanObject; #[test] fn event_create() { diff --git a/vulkano/src/sync/fence.rs b/vulkano/src/sync/fence.rs index 6d8cdef249..c5a26474e1 100644 --- a/vulkano/src/sync/fence.rs +++ b/vulkano/src/sync/fence.rs @@ -17,15 +17,15 @@ use std::sync::atomic::Ordering; use std::sync::Arc; use std::time::Duration; -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use Error; -use OomError; -use SafeDeref; -use Success; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::Error; +use crate::OomError; +use crate::SafeDeref; +use crate::Success; +use crate::VulkanObject; /// A fence is used to know when a command buffer submission has finished its execution. /// @@ -403,8 +403,8 @@ impl From for FenceWaitError { #[cfg(test)] mod tests { use std::time::Duration; - use sync::Fence; - use VulkanObject; + use crate::sync::Fence; + use crate::VulkanObject; #[test] fn fence_create() { diff --git a/vulkano/src/sync/future/fence_signal.rs b/vulkano/src/sync/future/fence_signal.rs index 8eb78f1b82..faacbadd0f 100644 --- a/vulkano/src/sync/future/fence_signal.rs +++ b/vulkano/src/sync/future/fence_signal.rs @@ -13,20 +13,20 @@ use std::sync::Mutex; use std::sync::MutexGuard; use std::time::Duration; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use command_buffer::submit::SubmitCommandBufferBuilder; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use image::ImageLayout; -use sync::AccessCheckError; -use sync::AccessFlagBits; -use sync::Fence; -use sync::FlushError; -use sync::GpuFuture; -use sync::PipelineStages; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::command_buffer::submit::SubmitCommandBufferBuilder; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::sync::AccessCheckError; +use crate::sync::AccessFlagBits; +use crate::sync::Fence; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; /// Builds a new fence signal future. #[inline] diff --git a/vulkano/src/sync/future/join.rs b/vulkano/src/sync/future/join.rs index dd96daf01c..c9f219661b 100644 --- a/vulkano/src/sync/future/join.rs +++ b/vulkano/src/sync/future/join.rs @@ -9,20 +9,20 @@ use std::sync::Arc; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use image::ImageLayout; -use sync::AccessCheckError; -use sync::AccessFlagBits; -use sync::FlushError; -use sync::GpuFuture; -use sync::PipelineStages; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::sync::AccessCheckError; +use crate::sync::AccessFlagBits; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; -use VulkanObject; +use crate::VulkanObject; /// Joins two futures together. // TODO: handle errors diff --git a/vulkano/src/sync/future/mod.rs b/vulkano/src/sync/future/mod.rs index 4707e9e295..27292102b9 100644 --- a/vulkano/src/sync/future/mod.rs +++ b/vulkano/src/sync/future/mod.rs @@ -11,26 +11,26 @@ use std::error; use std::fmt; use std::sync::Arc; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use command_buffer::submit::SubmitBindSparseError; -use command_buffer::submit::SubmitCommandBufferError; -use command_buffer::submit::SubmitPresentError; -use command_buffer::CommandBuffer; -use command_buffer::CommandBufferExecError; -use command_buffer::CommandBufferExecFuture; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use image::ImageLayout; -use swapchain; -use swapchain::PresentFuture; -use swapchain::PresentRegion; -use swapchain::Swapchain; -use sync::AccessFlagBits; -use sync::FenceWaitError; -use sync::PipelineStages; -use OomError; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::command_buffer::submit::SubmitBindSparseError; +use crate::command_buffer::submit::SubmitCommandBufferError; +use crate::command_buffer::submit::SubmitPresentError; +use crate::command_buffer::CommandBuffer; +use crate::command_buffer::CommandBufferExecError; +use crate::command_buffer::CommandBufferExecFuture; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::swapchain; +use crate::swapchain::PresentFuture; +use crate::swapchain::PresentRegion; +use crate::swapchain::Swapchain; +use crate::sync::AccessFlagBits; +use crate::sync::FenceWaitError; +use crate::sync::PipelineStages; +use crate::OomError; pub use self::fence_signal::{FenceSignalFuture, FenceSignalFutureBehavior}; pub use self::join::JoinFuture; diff --git a/vulkano/src/sync/future/now.rs b/vulkano/src/sync/future/now.rs index 8d88a25a9b..def10ac896 100644 --- a/vulkano/src/sync/future/now.rs +++ b/vulkano/src/sync/future/now.rs @@ -9,18 +9,18 @@ use std::sync::Arc; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use image::ImageLayout; -use sync::AccessCheckError; -use sync::AccessFlagBits; -use sync::FlushError; -use sync::GpuFuture; -use sync::PipelineStages; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::sync::AccessCheckError; +use crate::sync::AccessFlagBits; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; /// Builds a future that represents "now". #[inline] diff --git a/vulkano/src/sync/future/semaphore_signal.rs b/vulkano/src/sync/future/semaphore_signal.rs index 3961ae2742..a4a7a2d3ed 100644 --- a/vulkano/src/sync/future/semaphore_signal.rs +++ b/vulkano/src/sync/future/semaphore_signal.rs @@ -12,21 +12,21 @@ use std::sync::atomic::Ordering; use std::sync::Arc; use std::sync::Mutex; -use buffer::BufferAccess; -use command_buffer::submit::SubmitAnyBuilder; -use command_buffer::submit::SubmitCommandBufferBuilder; -use command_buffer::submit::SubmitSemaphoresWaitBuilder; -use device::Device; -use device::DeviceOwned; -use device::Queue; -use image::ImageAccess; -use image::ImageLayout; -use sync::AccessCheckError; -use sync::AccessFlagBits; -use sync::FlushError; -use sync::GpuFuture; -use sync::PipelineStages; -use sync::Semaphore; +use crate::buffer::BufferAccess; +use crate::command_buffer::submit::SubmitAnyBuilder; +use crate::command_buffer::submit::SubmitCommandBufferBuilder; +use crate::command_buffer::submit::SubmitSemaphoresWaitBuilder; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::device::Queue; +use crate::image::ImageAccess; +use crate::image::ImageLayout; +use crate::sync::AccessCheckError; +use crate::sync::AccessFlagBits; +use crate::sync::FlushError; +use crate::sync::GpuFuture; +use crate::sync::PipelineStages; +use crate::sync::Semaphore; /// Builds a new semaphore signal future. #[inline] diff --git a/vulkano/src/sync/mod.rs b/vulkano/src/sync/mod.rs index 5190abf185..ee6ae1c5ad 100644 --- a/vulkano/src/sync/mod.rs +++ b/vulkano/src/sync/mod.rs @@ -103,7 +103,7 @@ //! TODO: talk about fence + semaphore simultaneously //! TODO: talk about using fences to clean up -use device::Queue; +use crate::device::Queue; use std::sync::Arc; pub use self::event::Event; diff --git a/vulkano/src/sync/pipeline.rs b/vulkano/src/sync/pipeline.rs index 16dcd7fde9..5ba352c1d8 100644 --- a/vulkano/src/sync/pipeline.rs +++ b/vulkano/src/sync/pipeline.rs @@ -8,7 +8,7 @@ // according to those terms. use std::ops; -use vk; +use crate::vk; macro_rules! pipeline_stages { ($($elem:ident => $val:expr,)+) => ( diff --git a/vulkano/src/sync/semaphore.rs b/vulkano/src/sync/semaphore.rs index 8ce9779707..93bc66746e 100644 --- a/vulkano/src/sync/semaphore.rs +++ b/vulkano/src/sync/semaphore.rs @@ -11,13 +11,13 @@ use std::mem::MaybeUninit; use std::ptr; use std::sync::Arc; -use check_errors; -use device::Device; -use device::DeviceOwned; -use vk; -use OomError; -use SafeDeref; -use VulkanObject; +use crate::check_errors; +use crate::device::Device; +use crate::device::DeviceOwned; +use crate::vk; +use crate::OomError; +use crate::SafeDeref; +use crate::VulkanObject; /// Used to provide synchronization between command buffers during their execution. /// @@ -133,8 +133,8 @@ where #[cfg(test)] mod tests { - use sync::Semaphore; - use VulkanObject; + use crate::sync::Semaphore; + use crate::VulkanObject; #[test] fn semaphore_create() { diff --git a/vulkano/src/tests.rs b/vulkano/src/tests.rs index 53b6d79506..2b1d10d3b5 100644 --- a/vulkano/src/tests.rs +++ b/vulkano/src/tests.rs @@ -12,7 +12,7 @@ /// Creates an instance or returns if initialization fails. macro_rules! instance { () => {{ - use instance; + use crate::instance; match instance::Instance::new(None, &instance::InstanceExtensions::none(), None) { Ok(i) => i, @@ -24,10 +24,10 @@ macro_rules! instance { /// Creates a device and a queue for graphics operations. macro_rules! gfx_dev_and_queue { ($($feature:ident),*) => ({ - use instance; - use device::Device; - use device::DeviceExtensions; - use features::Features; + use crate::instance; + use crate::device::Device; + use crate::device::DeviceExtensions; + use crate::features::Features; let instance = instance!();