From dc3487234c7c73871f8aa7180dfa6f9de74eef1b Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 5 Apr 2017 16:23:38 +0200 Subject: [PATCH] Rename IntoImageView to ImageView --- vulkano/src/descriptor/descriptor_set/simple.rs | 8 ++++---- vulkano/src/framebuffer/framebuffer.rs | 2 +- vulkano/src/image/attachment.rs | 4 ++-- vulkano/src/image/immutable.rs | 4 ++-- vulkano/src/image/mod.rs | 2 +- vulkano/src/image/storage.rs | 4 ++-- vulkano/src/image/swapchain.rs | 6 +++--- vulkano/src/image/traits.rs | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/vulkano/src/descriptor/descriptor_set/simple.rs b/vulkano/src/descriptor/descriptor_set/simple.rs index b0dcb083..b9940a5c 100644 --- a/vulkano/src/descriptor/descriptor_set/simple.rs +++ b/vulkano/src/descriptor/descriptor_set/simple.rs @@ -26,7 +26,7 @@ use descriptor::pipeline_layout::PipelineLayoutAbstract; use device::Device; use device::DeviceOwned; use image::ImageAccess; -use image::IntoImageView; +use image::ImageView; use image::sys::Layout; use sampler::Sampler; use sync::AccessFlagBits; @@ -251,7 +251,7 @@ pub unsafe trait SimpleDescriptorSetImageExt { } unsafe impl SimpleDescriptorSetImageExt for T - where T: IntoImageView, L: PipelineLayoutAbstract + where T: ImageView, L: PipelineLayoutAbstract { type Out = (R, SimpleDescriptorSetImg); @@ -299,7 +299,7 @@ unsafe impl SimpleDescriptorSetImageExt for T } unsafe impl SimpleDescriptorSetImageExt for (T, Arc) - where T: IntoImageView, L: PipelineLayoutAbstract + where T: ImageView, L: PipelineLayoutAbstract { type Out = (R, SimpleDescriptorSetImg); @@ -342,7 +342,7 @@ unsafe impl SimpleDescriptorSetImageExt for (T, Arc) // TODO: DRY unsafe impl SimpleDescriptorSetImageExt for Vec<(T, Arc)> - where T: IntoImageView, L: PipelineLayoutAbstract + where T: ImageView, L: PipelineLayoutAbstract { type Out = (R, Vec>); diff --git a/vulkano/src/framebuffer/framebuffer.rs b/vulkano/src/framebuffer/framebuffer.rs index c03487c4..a4c2660d 100644 --- a/vulkano/src/framebuffer/framebuffer.rs +++ b/vulkano/src/framebuffer/framebuffer.rs @@ -130,7 +130,7 @@ impl Framebuffer> { /// Builds a new framebuffer. /// /// The `attachments` parameter depends on which render pass implementation is used. - // TODO: allow IntoImageView + // TODO: allow ImageView pub fn new(render_pass: Rp, dimensions: [u32; 3], attachments: Ia) -> Result>>, FramebufferCreationError> where Rp: RenderPassAbstract + RenderPassDescAttachmentsList diff --git a/vulkano/src/image/attachment.rs b/vulkano/src/image/attachment.rs index 352e04c7..8e2f392b 100644 --- a/vulkano/src/image/attachment.rs +++ b/vulkano/src/image/attachment.rs @@ -31,7 +31,7 @@ use image::traits::ImageClearValue; use image::traits::ImageContent; use image::traits::ImageViewAccess; use image::traits::Image; -use image::traits::IntoImageView; +use image::traits::ImageView; use memory::pool::AllocLayout; use memory::pool::MemoryPool; use memory::pool::MemoryPoolAlloc; @@ -291,7 +291,7 @@ unsafe impl Image for Arc> } } -unsafe impl IntoImageView for Arc> +unsafe impl ImageView for Arc> where F: 'static + Send + Sync, A: MemoryPool { type Target = AttachmentImageAccess; diff --git a/vulkano/src/image/immutable.rs b/vulkano/src/image/immutable.rs index 747855a9..58ccebd5 100644 --- a/vulkano/src/image/immutable.rs +++ b/vulkano/src/image/immutable.rs @@ -24,7 +24,7 @@ use image::traits::ImageAccess; use image::traits::ImageContent; use image::traits::ImageViewAccess; use image::traits::Image; -use image::traits::IntoImageView; +use image::traits::ImageView; use instance::QueueFamily; use memory::pool::AllocLayout; use memory::pool::MemoryPool; @@ -138,7 +138,7 @@ unsafe impl Image for Arc> } // FIXME: wrong -unsafe impl IntoImageView for Arc> +unsafe impl ImageView for Arc> where F: 'static + Send + Sync, A: MemoryPool { type Target = Self; diff --git a/vulkano/src/image/mod.rs b/vulkano/src/image/mod.rs index d3337fc3..dee60eae 100644 --- a/vulkano/src/image/mod.rs +++ b/vulkano/src/image/mod.rs @@ -56,7 +56,7 @@ pub use self::sys::Usage; pub use self::traits::ImageAccess; pub use self::traits::ImageViewAccess; pub use self::traits::Image; -pub use self::traits::IntoImageView; +pub use self::traits::ImageView; pub mod attachment; // TODO: make private pub mod immutable; // TODO: make private diff --git a/vulkano/src/image/storage.rs b/vulkano/src/image/storage.rs index 183bdb7d..f9e4664f 100644 --- a/vulkano/src/image/storage.rs +++ b/vulkano/src/image/storage.rs @@ -29,7 +29,7 @@ use image::traits::ImageClearValue; use image::traits::ImageContent; use image::traits::ImageViewAccess; use image::traits::Image; -use image::traits::IntoImageView; +use image::traits::ImageView; use instance::QueueFamily; use memory::pool::AllocLayout; use memory::pool::MemoryPool; @@ -155,7 +155,7 @@ unsafe impl Image for Arc> } // FIXME: wrong -unsafe impl IntoImageView for Arc> +unsafe impl ImageView for Arc> where F: 'static + Send + Sync, A: MemoryPool { type Target = Self; diff --git a/vulkano/src/image/swapchain.rs b/vulkano/src/image/swapchain.rs index 9aa27571..252d198e 100644 --- a/vulkano/src/image/swapchain.rs +++ b/vulkano/src/image/swapchain.rs @@ -20,7 +20,7 @@ use image::traits::ImageClearValue; use image::traits::ImageContent; use image::traits::ImageViewAccess; use image::traits::Image; -use image::traits::IntoImageView; +use image::traits::ImageView; use image::sys::Layout; use image::sys::UnsafeImage; use image::sys::UnsafeImageView; @@ -184,7 +184,7 @@ unsafe impl Image for SwapchainImage { } } -unsafe impl IntoImageView for SwapchainImage { +unsafe impl ImageView for SwapchainImage { type Target = SwapchainImage; fn into_image_view(self) -> Self::Target { @@ -200,7 +200,7 @@ unsafe impl Image for Arc { } } -unsafe impl IntoImageView for Arc { +unsafe impl ImageView for Arc { type Target = Arc; fn into_image_view(self) -> Self::Target { diff --git a/vulkano/src/image/traits.rs b/vulkano/src/image/traits.rs index 47ec4bfb..e04d4c77 100644 --- a/vulkano/src/image/traits.rs +++ b/vulkano/src/image/traits.rs @@ -207,7 +207,7 @@ pub unsafe trait ImageContent

: ImageAccess { } /// Utility trait. -pub unsafe trait IntoImageView { +pub unsafe trait ImageView { type Target: ImageViewAccess; fn into_image_view(self) -> Self::Target;