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

Merge pull request #62 from tomaka/buffers-align

Browse Source 
Enforce more buffer alignment requirements
This commit is contained in:
tomaka 2016-04-28 13:07:57 +02:00
commit 769a78b2eb
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
vulkano/src/buffer/sys.rs
View File

@ -69,7 +69,7 @@ impl UnsafeBuffer {
{
let vk = device.pointers();
let usage = usage.to_usage_bits();
let usage_bits = usage.to_usage_bits();
// Checking sparse features.
assert!(sparse.sparse || !sparse.sparse_residency, "Can't enable sparse residency without \
@ -97,7 +97,7 @@ impl UnsafeBuffer {
pNext: ptr::null(),
flags: sparse.to_flags(),
size: size as u64,
usage: usage,
usage: usage_bits,
sharingMode: sh_mode,
queueFamilyIndexCount: sh_indices.len() as u32,
pQueueFamilyIndices: sh_indices.as_ptr(),
@ -109,11 +109,33 @@ impl UnsafeBuffer {
output
};
let mem_reqs: vk::MemoryRequirements = {
let mut output = mem::uninitialized();
let mem_reqs = {
#[inline] fn align(val: usize, al: usize) -> usize { al * (1 + (val - 1) / al) }
let mut output: vk::MemoryRequirements = mem::uninitialized();
vk.GetBufferMemoryRequirements(device.internal_object(), buffer, &mut output);
debug_assert!(output.size >= size as u64);
debug_assert!(output.memoryTypeBits != 0);
let mut output: MemoryRequirements = output.into();
// We have to manually enforce some additional requirements for some buffer types.
let limits = device.physical_device().limits();
if usage.uniform_texel_buffer || usage.storage_texel_buffer {
output.alignment = align(output.alignment,
limits.min_texel_buffer_offset_alignment() as usize);
}
if usage.storage_buffer {
output.alignment = align(output.alignment,
limits.min_storage_buffer_offset_alignment() as usize);
}
if usage.uniform_buffer {
output.alignment = align(output.alignment,
limits.min_uniform_buffer_offset_alignment() as usize);
}
output
};
@ -121,10 +143,10 @@ impl UnsafeBuffer {
buffer: buffer,
device: device.clone(),
size: size as usize,
usage: usage,
usage: usage_bits,
};
Ok((obj, mem_reqs.into()))
Ok((obj, mem_reqs))
}
pub unsafe fn bind_memory(&self, memory: &DeviceMemory, offset: usize)
@ -142,6 +164,20 @@ impl UnsafeBuffer {
mem_reqs.memoryTypeBits & (1 << memory.memory_type().id()) != 0
});
// Check for alignment correctness.
{
let limits = self.device().physical_device().limits();
if self.usage_uniform_texel_buffer() || self.usage_storage_texel_buffer() {
debug_assert!(offset % limits.min_texel_buffer_offset_alignment() as usize == 0);
}
if self.usage_storage_buffer() {
debug_assert!(offset % limits.min_storage_buffer_offset_alignment() as usize == 0);
}
if self.usage_uniform_buffer() {
debug_assert!(offset % limits.min_uniform_buffer_offset_alignment() as usize == 0);
}
}
try!(check_errors(vk.BindBufferMemory(self.device.internal_object(), self.buffer,
memory.internal_object(), offset as vk::DeviceSize)));
Ok(())