From b1011816ce206252a925869f48494ac30b8a2bfc Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 23 Jul 2017 23:53:10 -0700 Subject: [PATCH] Restore deprecated ImmutableImage constructors --- vulkano/src/image/immutable.rs | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/vulkano/src/image/immutable.rs b/vulkano/src/image/immutable.rs index e322dd917..464086313 100644 --- a/vulkano/src/image/immutable.rs +++ b/vulkano/src/image/immutable.rs @@ -66,6 +66,42 @@ pub struct ImmutableImageInitialization { } impl ImmutableImage { + #[deprecated(note = "use ImmutableImage::uninitialized instead")] + #[inline] + pub fn new<'a, I>(device: Arc, dimensions: Dimensions, format: F, queue_families: I) + -> Result>, ImageCreationError> + where F: FormatDesc, + I: IntoIterator> + { + #[allow(deprecated)] + ImmutableImage::with_mipmaps(device, + dimensions, + format, + MipmapsCount::One, + queue_families) + } + + #[deprecated(note = "use ImmutableImage::uninitialized instead")] + #[inline] + pub fn with_mipmaps<'a, I, M>(device: Arc, dimensions: Dimensions, format: F, + mipmaps: M, queue_families: I) + -> Result>, ImageCreationError> + where F: FormatDesc, + I: IntoIterator>, + M: Into + { + let usage = ImageUsage { + transfer_source: true, // for blits + transfer_destination: true, + sampled: true, + ..ImageUsage::none() + }; + + let (image, _) = ImmutableImage::uninitialized(device, dimensions, format, mipmaps, usage, ImageLayout::ShaderReadOnlyOptimal, queue_families)?; + image.initialized.store(true, Ordering::Relaxed); // Allow uninitialized access for backwards compatibility + Ok(image) + } + /// Builds an uninitialized immutable image. /// /// Returns two things: the image, and a special access that should be used for the initial upload to the image.