diff --git a/vulkano/autogen/extensions.rs b/vulkano/autogen/extensions.rs index 22f60f5d..9bcd0716 100644 --- a/vulkano/autogen/extensions.rs +++ b/vulkano/autogen/extensions.rs @@ -565,13 +565,6 @@ fn extensions_common_output(struct_name: Ident, members: &[ExtensionsMember]) -> } } - /// Returns an `Extensions` object with none of the members set. - #[deprecated(since = "0.31.0", note = "use `empty` instead")] - #[inline] - pub const fn none() -> Self { - Self::empty() - } - /// Returns whether any members are set in both `self` and `other`. #[inline] pub const fn intersects(&self, other: &Self) -> bool { @@ -584,13 +577,6 @@ fn extensions_common_output(struct_name: Ident, members: &[ExtensionsMember]) -> #(#contains_items)&&* } - /// Returns whether all members in `other` are set in `self`. - #[deprecated(since = "0.31.0", note = "use `contains` instead")] - #[inline] - pub const fn is_superset_of(&self, other: &Self) -> bool { - self.contains(other) - } - /// Returns the union of `self` and `other`. #[inline] pub const fn union(&self, other: &Self) -> Self { diff --git a/vulkano/autogen/features.rs b/vulkano/autogen/features.rs index 689aa2d8..0001d7aa 100644 --- a/vulkano/autogen/features.rs +++ b/vulkano/autogen/features.rs @@ -257,11 +257,11 @@ fn features_output(members: &[FeaturesMember]) -> TokenStream { /// ..Features::empty() /// }; /// - /// if !physical_device.supported_features().is_superset_of(&minimal_features) { + /// if !physical_device.supported_features().contains(&minimal_features) { /// panic!("The physical device is not good enough for this application."); /// } /// - /// assert!(optimal_features.is_superset_of(&minimal_features)); + /// assert!(optimal_features.contains(&minimal_features)); /// let features_to_request = optimal_features.intersection(physical_device.supported_features()); /// ``` #[derive(Copy, Clone, PartialEq, Eq, Hash)] @@ -296,13 +296,6 @@ fn features_output(members: &[FeaturesMember]) -> TokenStream { } } - /// Returns an `Features` object with none of the members set. - #[deprecated(since = "0.31.0", note = "use `empty` instead")] - #[inline] - pub const fn none() -> Self { - Self::empty() - } - /// Returns a `Features` object with all of the members set. #[cfg(test)] pub(crate) const fn all() -> Features { @@ -324,13 +317,6 @@ fn features_output(members: &[FeaturesMember]) -> TokenStream { #(#contains_items)&&* } - /// Returns whether all members in `other` are set in `self`. - #[deprecated(since = "0.31.0", note = "use `contains` instead")] - #[inline] - pub const fn is_superset_of(&self, other: &Self) -> bool { - self.contains(other) - } - /// Returns the union of `self` and `other`. #[inline] pub const fn union(&self, other: &Self) -> Self { diff --git a/vulkano/src/format.rs b/vulkano/src/format.rs index 1f7e98c0..5e1a35be 100644 --- a/vulkano/src/format.rs +++ b/vulkano/src/format.rs @@ -85,7 +85,7 @@ //! method on a format. use crate::{ - device::{physical::PhysicalDevice, Device}, + device::Device, image::{ImageAspects, ImageTiling}, macros::vulkan_bitflags, shader::spirv::ImageFormat, @@ -96,16 +96,6 @@ use crate::{ include!(concat!(env!("OUT_DIR"), "/formats.rs")); impl Format { - /// Retrieves the properties of a format when used by a certain device. - #[deprecated( - since = "0.28.0", - note = "use PhysicalDevice::format_properties instead" - )] - #[inline] - pub fn properties(self, physical_device: PhysicalDevice) -> FormatProperties { - physical_device.format_properties(self).unwrap() - } - /// Returns whether the format can be used with a storage image, without specifying /// the format in the shader, if the /// [`shader_storage_image_read_without_format`](crate::device::Features::shader_storage_image_read_without_format) diff --git a/vulkano/src/macros.rs b/vulkano/src/macros.rs index 8cb9a55c..e57bc251 100644 --- a/vulkano/src/macros.rs +++ b/vulkano/src/macros.rs @@ -26,13 +26,6 @@ macro_rules! vulkan_bitflags { Self(0) } - #[deprecated(since = "0.31.0", note = "use `empty` instead")] - #[doc = concat!("Returns a `", stringify!($ty), "` with none of the flags set.")] - #[inline] - pub const fn none() -> Self { - Self::empty() - } - #[doc = concat!("Returns a `", stringify!($ty), "` with all of the flags set.")] #[inline] pub const fn all() -> Self { @@ -254,13 +247,6 @@ macro_rules! vulkan_bitflags { Self(0) } - #[deprecated(since = "0.31.0", note = "use `empty` instead")] - #[doc = concat!("Returns a `", stringify!($ty), "` with none of the flags set.")] - #[inline] - pub const fn none() -> Self { - Self::empty() - } - const fn all_raw() -> $repr { 0 $(