Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retroactively abort FastMemoryAllocator #2159

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Retroactively abort FastMemoryAllocator #2159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 4 additions & 31 deletions vulkano/src/memory/allocator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,11 +600,11 @@ impl From<VulkanError> for AllocationCreationError {

/// Standard memory allocator intended as a global and general-purpose allocator.
///
/// This type of allocator should work well in most cases, it is however **not** to be used when
/// allocations need to be made very frequently (say, once or more per frame). For that purpose,
/// use [`FastMemoryAllocator`].
/// This type of allocator is what you should always use, unless you know, for a fact, that it is
/// not suited to the task.
///
/// See [`FreeListAllocator`] for details about the allocation algorithm and example usage.
/// See also [`GenericMemoryAllocator`] for details about the allocation algorithm, and
/// [`FreeListAllocator`] for details about the suballocation algorithm and example usage.
pub type StandardMemoryAllocator = GenericMemoryAllocator<Arc<FreeListAllocator>>;

impl StandardMemoryAllocator {
Expand All @@ -624,33 +624,6 @@ impl StandardMemoryAllocator {
}
}

/// Fast memory allocator intended as a local and special-purpose allocator.
///
/// This type of allocator is only useful when you need to allocate a lot, for example once or more
/// per frame. It is **not** to be used when allocations are long-lived. For that purpose use
/// [`StandardMemoryAllocator`].
///
/// See [`BumpAllocator`] for details about the allocation algorithm.
pub type FastMemoryAllocator = GenericMemoryAllocator<Arc<BumpAllocator>>;

impl FastMemoryAllocator {
/// Creates a new `FastMemoryAllocator` with default configuration.
pub fn new_default(device: Arc<Device>) -> Self {
#[allow(clippy::erasing_op, clippy::identity_op)]
let create_info = GenericMemoryAllocatorCreateInfo {
#[rustfmt::skip]
block_sizes: &[
( 0 * B, 16 * M),
(512 * M, 32 * M),
( 1 * G, 64 * M),
],
..Default::default()
};

unsafe { Self::new_unchecked(device, create_info) }
}
}

/// A generic implementation of a [memory allocator].
///
/// The allocator keeps a pool of [`DeviceMemory`] blocks for each memory type and uses the type
Expand Down