ValidationError-ify memory and memory allocators

vulkano/src/buffer/allocator.rs

@@ -17,7 +17,7 @@ use crate::{
     device::{Device, DeviceOwned},
     memory::{
         allocator::{
-            align_up, AllocationCreateInfo, AllocationCreationError, DeviceLayout, MemoryAllocator,
+            align_up, AllocationCreateInfo, DeviceLayout, MemoryAllocator, MemoryAllocatorError,
             MemoryUsage, StandardMemoryAllocator,
         },
         DeviceAlignment,
@@ -188,7 +188,7 @@ where
     /// If `size` is greater than the current arena size, then a new arena will be allocated with
     /// the new size, and all subsequently allocated arenas will also share the new size. Otherwise
     /// this has no effect.
-    pub fn reserve(&self, size: DeviceSize) -> Result<(), AllocationCreationError> {
+    pub fn reserve(&self, size: DeviceSize) -> Result<(), MemoryAllocatorError> {
         if size > self.arena_size() {
             let state = unsafe { &mut *self.state.get() };
             state.arena_size = size;
@@ -200,7 +200,7 @@ where
     }
 
     /// Allocates a subbuffer for sized data.
-    pub fn allocate_sized<T>(&self) -> Result<Subbuffer<T>, AllocationCreationError>
+    pub fn allocate_sized<T>(&self) -> Result<Subbuffer<T>, MemoryAllocatorError>
     where
         T: BufferContents,
     {
@@ -216,10 +216,7 @@ where
     /// # Panics
     ///
     /// - Panics if `len` is zero.
-    pub fn allocate_slice<T>(
-        &self,
-        len: DeviceSize,
-    ) -> Result<Subbuffer<[T]>, AllocationCreationError>
+    pub fn allocate_slice<T>(&self, len: DeviceSize) -> Result<Subbuffer<[T]>, MemoryAllocatorError>
     where
         T: BufferContents,
     {
@@ -231,10 +228,7 @@ where
     /// # Panics
     ///
     /// - Panics if `len` is zero.
-    pub fn allocate_unsized<T>(
-        &self,
-        len: DeviceSize,
-    ) -> Result<Subbuffer<T>, AllocationCreationError>
+    pub fn allocate_unsized<T>(&self, len: DeviceSize) -> Result<Subbuffer<T>, MemoryAllocatorError>
     where
         T: BufferContents + ?Sized,
     {
@@ -251,10 +245,7 @@ where
     /// # Panics
     ///
     /// - Panics if `layout.alignment()` exceeds `64`.
-    pub fn allocate(
-        &self,
-        layout: DeviceLayout,
-    ) -> Result<Subbuffer<[u8]>, AllocationCreationError> {
+    pub fn allocate(&self, layout: DeviceLayout) -> Result<Subbuffer<[u8]>, MemoryAllocatorError> {
         assert!(layout.alignment().as_devicesize() <= 64);
 
         unsafe { &mut *self.state.get() }.allocate(layout)
@@ -291,10 +282,7 @@ impl<A> SubbufferAllocatorState<A>
 where
     A: MemoryAllocator,
 {
-    fn allocate(
-        &mut self,
-        layout: DeviceLayout,
-    ) -> Result<Subbuffer<[u8]>, AllocationCreationError> {
+    fn allocate(&mut self, layout: DeviceLayout) -> Result<Subbuffer<[u8]>, MemoryAllocatorError> {
         let size = layout.size();
         let alignment = cmp::max(layout.alignment(), self.buffer_alignment);
 
@@ -335,7 +323,7 @@ where
         }
     }
 
-    fn next_arena(&mut self) -> Result<Arc<Arena>, AllocationCreationError> {
+    fn next_arena(&mut self) -> Result<Arc<Arena>, MemoryAllocatorError> {
         if self.reserve.is_none() {
             self.reserve = Some(Arc::new(ArrayQueue::new(MAX_ARENAS)));
         }
@@ -353,7 +341,7 @@ where
             })
     }
 
-    fn create_arena(&self) -> Result<Arc<Buffer>, AllocationCreationError> {
+    fn create_arena(&self) -> Result<Arc<Buffer>, MemoryAllocatorError> {
         Buffer::new(
             &self.memory_allocator,
             BufferCreateInfo {

vulkano/src/buffer/mod.rs

@@ -115,8 +115,8 @@ use crate::{
     macros::{vulkan_bitflags, vulkan_enum},
     memory::{
         allocator::{
-            AllocationCreateInfo, AllocationCreationError, AllocationType, DeviceLayout,
-            MemoryAlloc, MemoryAllocator,
+            AllocationCreateInfo, AllocationType, DeviceLayout, MemoryAlloc, MemoryAllocator,
+            MemoryAllocatorError,
         },
         is_aligned, DedicatedAllocation, DeviceAlignment, ExternalMemoryHandleType,
         ExternalMemoryHandleTypes, ExternalMemoryProperties, MemoryRequirements,
@@ -782,7 +782,7 @@ pub enum BufferError {
     RuntimeError(RuntimeError),
 
     /// Allocating memory failed.
-    AllocError(AllocationCreationError),
+    AllocError(MemoryAllocatorError),
 
     RequirementNotMet {
         required_for: &'static str,
@@ -997,8 +997,8 @@ impl From<RuntimeError> for BufferError {
     }
 }
 
-impl From<AllocationCreationError> for BufferError {
-    fn from(err: AllocationCreationError) -> Self {
+impl From<MemoryAllocatorError> for BufferError {
+    fn from(err: MemoryAllocatorError) -> Self {
         Self::AllocError(err)
     }
 }

vulkano/src/image/attachment.rs

@@ -21,10 +21,9 @@ use crate::{
             AllocationCreateInfo, AllocationType, MemoryAllocatePreference, MemoryAllocator,
             MemoryUsage,
         },
-        is_aligned, DedicatedAllocation, DeviceMemoryError, ExternalMemoryHandleType,
-        ExternalMemoryHandleTypes,
+        is_aligned, DedicatedAllocation, ExternalMemoryHandleType, ExternalMemoryHandleTypes,
     },
-    DeviceSize,
+    DeviceSize, VulkanError,
 };
 use std::{
     fs::File,
@@ -563,7 +562,7 @@ impl AttachmentImage {
     /// Exports posix file descriptor for the allocated memory.
     /// Requires `khr_external_memory_fd` and `khr_external_memory` extensions to be loaded.
     #[inline]
-    pub fn export_posix_fd(&self) -> Result<File, DeviceMemoryError> {
+    pub fn export_posix_fd(&self) -> Result<File, VulkanError> {
         let allocation = match self.inner.memory() {
             ImageMemory::Normal(a) => &a[0],
             _ => unreachable!(),

vulkano/src/image/immutable.rs

@@ -24,8 +24,8 @@ use crate::{
     image::sys::ImageCreateInfo,
     memory::{
         allocator::{
-            AllocationCreateInfo, AllocationCreationError, AllocationType,
-            MemoryAllocatePreference, MemoryAllocator, MemoryUsage,
+            AllocationCreateInfo, AllocationType, MemoryAllocatePreference, MemoryAllocator,
+            MemoryAllocatorError, MemoryUsage,
         },
         is_aligned, DedicatedAllocation,
     },
@@ -402,7 +402,7 @@ impl Hash for ImmutableImageInitialization {
 #[derive(Clone, Debug)]
 pub enum ImmutableImageCreationError {
     ImageCreationError(ImageError),
-    AllocError(AllocationCreationError),
+    AllocError(MemoryAllocatorError),
     CommandBufferBeginError(CommandBufferBeginError),
 
     /// The size of the provided source data is less than the required size for an image with the
@@ -449,8 +449,8 @@ impl From<ImageError> for ImmutableImageCreationError {
     }
 }
 
-impl From<AllocationCreationError> for ImmutableImageCreationError {
-    fn from(err: AllocationCreationError) -> Self {
+impl From<MemoryAllocatorError> for ImmutableImageCreationError {
+    fn from(err: MemoryAllocatorError) -> Self {
         Self::AllocError(err)
     }
 }

vulkano/src/image/storage.rs

@@ -22,11 +22,10 @@ use crate::{
             AllocationCreateInfo, AllocationType, MemoryAllocatePreference, MemoryAllocator,
             MemoryUsage,
         },
-        is_aligned, DedicatedAllocation, DeviceMemoryError, ExternalMemoryHandleType,
-        ExternalMemoryHandleTypes,
+        is_aligned, DedicatedAllocation, ExternalMemoryHandleType, ExternalMemoryHandleTypes,
     },
     sync::Sharing,
-    DeviceSize,
+    DeviceSize, VulkanError,
 };
 use smallvec::SmallVec;
 
@@ -422,7 +421,7 @@ impl StorageImage {
     /// Exports posix file descriptor for the allocated memory.
     /// Requires `khr_external_memory_fd` and `khr_external_memory` extensions to be loaded.
     #[inline]
-    pub fn export_posix_fd(&self) -> Result<File, DeviceMemoryError> {
+    pub fn export_posix_fd(&self) -> Result<File, VulkanError> {
         let allocation = match self.inner.memory() {
             ImageMemory::Normal(a) => &a[0],
             _ => unreachable!(),

vulkano/src/image/sys.rs

@@ -29,7 +29,7 @@ use crate::{
     },
     macros::impl_id_counter,
     memory::{
-        allocator::{AllocationCreationError, AllocationType, DeviceLayout, MemoryAlloc},
+        allocator::{AllocationType, DeviceLayout, MemoryAlloc, MemoryAllocatorError},
         is_aligned, DedicatedTo, DeviceAlignment, ExternalMemoryHandleType,
         ExternalMemoryHandleTypes, MemoryPropertyFlags, MemoryRequirements,
     },
@@ -2790,7 +2790,7 @@ pub enum ImageError {
     RuntimeError(RuntimeError),
 
     /// Allocating memory failed.
-    AllocError(AllocationCreationError),
+    AllocError(MemoryAllocatorError),
 
     RequirementNotMet {
         required_for: &'static str,
@@ -3264,8 +3264,8 @@ impl From<RuntimeError> for ImageError {
     }
 }
 
-impl From<AllocationCreationError> for ImageError {
-    fn from(err: AllocationCreationError) -> Self {
+impl From<MemoryAllocatorError> for ImageError {
+    fn from(err: MemoryAllocatorError) -> Self {
         Self::AllocError(err)
     }
 }