nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-23 15:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename IntoImageView to ImageView

Browse Source
This commit is contained in:
Pierre Krieger 2017-04-05 16:23:38 +02:00
parent 9182d44d0a
commit dc3487234c
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vulkano/src/descriptor/descriptor_set/simple.rs
View File

@ -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<L, R> {
}
unsafe impl<L, R, T> SimpleDescriptorSetImageExt<L, R> for T
where T: IntoImageView, L: PipelineLayoutAbstract
where T: ImageView, L: PipelineLayoutAbstract
{
type Out = (R, SimpleDescriptorSetImg<T::Target>);
@ -299,7 +299,7 @@ unsafe impl<L, R, T> SimpleDescriptorSetImageExt<L, R> for T
}
unsafe impl<L, R, T> SimpleDescriptorSetImageExt<L, R> for (T, Arc<Sampler>)
where T: IntoImageView, L: PipelineLayoutAbstract
where T: ImageView, L: PipelineLayoutAbstract
{
type Out = (R, SimpleDescriptorSetImg<T::Target>);
@ -342,7 +342,7 @@ unsafe impl<L, R, T> SimpleDescriptorSetImageExt<L, R> for (T, Arc<Sampler>)
// TODO: DRY
unsafe impl<L, R, T> SimpleDescriptorSetImageExt<L, R> for Vec<(T, Arc<Sampler>)>
where T: IntoImageView, L: PipelineLayoutAbstract
where T: ImageView, L: PipelineLayoutAbstract
{
type Out = (R, Vec<SimpleDescriptorSetImg<T::Target>>);

2
vulkano/src/framebuffer/framebuffer.rs
View File

@ -130,7 +130,7 @@ impl<Rp> Framebuffer<Rp, Box<AttachmentsList + Send + Sync>> {
/// Builds a new framebuffer.
///
/// The `attachments` parameter depends on which render pass implementation is used.
// TODO: allow IntoImageView
// TODO: allow ImageView
pub fn new<Ia>(render_pass: Rp, dimensions: [u32; 3], attachments: Ia)
-> Result<Arc<Framebuffer<Rp, Box<AttachmentsList + Send + Sync>>>, FramebufferCreationError>
where Rp: RenderPassAbstract + RenderPassDescAttachmentsList<Ia>

4
vulkano/src/image/attachment.rs
View File

@ -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<F, A> Image for Arc<AttachmentImage<F, A>>
}
}
unsafe impl<F, A> IntoImageView for Arc<AttachmentImage<F, A>>
unsafe impl<F, A> ImageView for Arc<AttachmentImage<F, A>>
where F: 'static + Send + Sync, A: MemoryPool
{
type Target = AttachmentImageAccess<F, A>;

4
vulkano/src/image/immutable.rs
View File

@ -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<F, A> Image for Arc<ImmutableImage<F, A>>
}
// FIXME: wrong
unsafe impl<F, A> IntoImageView for Arc<ImmutableImage<F, A>>
unsafe impl<F, A> ImageView for Arc<ImmutableImage<F, A>>
where F: 'static + Send + Sync, A: MemoryPool
{
type Target = Self;

2
vulkano/src/image/mod.rs
View File

@ -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

4
vulkano/src/image/storage.rs
View File

@ -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<F, A> Image for Arc<StorageImage<F, A>>
}
// FIXME: wrong
unsafe impl<F, A> IntoImageView for Arc<StorageImage<F, A>>
unsafe impl<F, A> ImageView for Arc<StorageImage<F, A>>
where F: 'static + Send + Sync, A: MemoryPool
{
type Target = Self;

6
vulkano/src/image/swapchain.rs
View File

@ -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<SwapchainImage> {
}
}
unsafe impl IntoImageView for Arc<SwapchainImage> {
unsafe impl ImageView for Arc<SwapchainImage> {
type Target = Arc<SwapchainImage>;
fn into_image_view(self) -> Self::Target {

2
vulkano/src/image/traits.rs
View File

@ -207,7 +207,7 @@ pub unsafe trait ImageContent<P>: ImageAccess {
}
/// Utility trait.
pub unsafe trait IntoImageView {
pub unsafe trait ImageView {
type Target: ImageViewAccess;
fn into_image_view(self) -> Self::Target;