nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-21 22:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment checks when allocating buffers (#2476)

Browse Source
This commit is contained in:
marc0246 2024-02-27 14:59:59 +01:00 committed by GitHub
parent 89e75cae2d
commit 817436b13c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vulkano/src/buffer/allocator.rs
View File

@ -252,13 +252,7 @@ where
} }
/// Allocates a subbuffer with the given `layout`. /// Allocates a subbuffer with the given `layout`.
///
/// # Panics
///
/// - Panics if `layout.alignment()` exceeds `64`.
pub fn allocate(&self, layout: DeviceLayout) -> Result<Subbuffer<[u8]>, MemoryAllocatorError> { pub fn allocate(&self, layout: DeviceLayout) -> Result<Subbuffer<[u8]>, MemoryAllocatorError> {
assert!(layout.alignment().as_devicesize() <= 64);
unsafe { &mut *self.state.get() }.allocate(layout) unsafe { &mut *self.state.get() }.allocate(layout)
} }
} }

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

@ -376,14 +376,12 @@ impl Buffer {
/// # Panics /// # Panics
/// ///
/// - Panics if `create_info.size` is not zero. /// - Panics if `create_info.size` is not zero.
/// - Panics if `layout.alignment()` is greater than 64.
pub fn new( pub fn new(
allocator: Arc<dyn MemoryAllocator>, allocator: Arc<dyn MemoryAllocator>,
mut create_info: BufferCreateInfo, mut create_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo, allocation_info: AllocationCreateInfo,
layout: DeviceLayout, layout: DeviceLayout,
) -> Result<Arc<Self>, Validated<AllocateBufferError>> { ) -> Result<Arc<Self>, Validated<AllocateBufferError>> {
assert!(layout.alignment().as_devicesize() <= 64);
// TODO: Enable once sparse binding materializes // TODO: Enable once sparse binding materializes
// assert!(!allocate_info.flags.contains(BufferCreateFlags::SPARSE_BINDING)); // assert!(!allocate_info.flags.contains(BufferCreateFlags::SPARSE_BINDING));

4
vulkano/src/buffer/subbuffer.rs
View File

@ -300,6 +300,8 @@ where
/// [`SubbufferAllocator`]: super::allocator::SubbufferAllocator /// [`SubbufferAllocator`]: super::allocator::SubbufferAllocator
/// [`RawBuffer::assume_bound`]: crate::buffer::sys::RawBuffer::assume_bound /// [`RawBuffer::assume_bound`]: crate::buffer::sys::RawBuffer::assume_bound
pub fn read(&self) -> Result<BufferReadGuard<'_, T>, HostAccessError> { pub fn read(&self) -> Result<BufferReadGuard<'_, T>, HostAccessError> {
assert!(T::LAYOUT.alignment().as_devicesize() <= 64);
let allocation = match self.buffer().memory() { let allocation = match self.buffer().memory() {
BufferMemory::Normal(a) => a, BufferMemory::Normal(a) => a,
BufferMemory::Sparse => todo!("`Subbuffer::read` doesn't support sparse binding yet"), BufferMemory::Sparse => todo!("`Subbuffer::read` doesn't support sparse binding yet"),
@ -391,6 +393,8 @@ where
/// [`SubbufferAllocator`]: super::allocator::SubbufferAllocator /// [`SubbufferAllocator`]: super::allocator::SubbufferAllocator
/// [`RawBuffer::assume_bound`]: crate::buffer::sys::RawBuffer::assume_bound /// [`RawBuffer::assume_bound`]: crate::buffer::sys::RawBuffer::assume_bound
pub fn write(&self) -> Result<BufferWriteGuard<'_, T>, HostAccessError> { pub fn write(&self) -> Result<BufferWriteGuard<'_, T>, HostAccessError> {
assert!(T::LAYOUT.alignment().as_devicesize() <= 64);
let allocation = match self.buffer().memory() { let allocation = match self.buffer().memory() {
BufferMemory::Normal(a) => a, BufferMemory::Normal(a) => a,
BufferMemory::Sparse => todo!("`Subbuffer::write` doesn't support sparse binding yet"), BufferMemory::Sparse => todo!("`Subbuffer::write` doesn't support sparse binding yet"),