alex/ash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use correct padding

Browse source
This commit is contained in:
Maik Klein 2017-06-11 14:59:12 +02:00
parent dbe7846726
commit 0b8f554dd9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ash/src/util.rs
View file

@ -6,7 +6,6 @@ use std::mem::size_of;
/// align slices at runtime. One example would be to align different images in one buffer.
/// There is usually no indicates of how big an image is at compile time and `AlignByteSlice`
/// will align those image byte slices at runtime.
#[derive(Debug, Clone)]
pub struct AlignByteSlice {
ptr: *mut (),
@ -18,7 +17,7 @@ impl AlignByteSlice {
pub fn copy_from_slices(&mut self, slices: &[&[u8]]) {
self.ptr as *mut u8;
let mut current = 0;
for slice in slices{
for slice in slices {
unsafe {
assert!(current <= self.size, "");
let ptr = (self.ptr as *mut u8).offset(current as isize);
@ -37,7 +36,7 @@ impl AlignByteSlice {
AlignByteSlice {
ptr,
size,
alignment
alignment,
}
}
}
@ -50,7 +49,6 @@ impl AlignByteSlice {
/// expects a 4 byte padding in between each Vec3<f32>, if the alignment is 16 bytes.
/// `Vec3<f32>, 4bytes, Vec3<f32>, 4bytes, Vec3<f32>...`. Align is able to take a slice
/// that is allocated on 4 bytes boundries, and insert the correct amount of paddings.
#[derive(Debug, Clone)]
pub struct Align<T> {
ptr: *mut (),
@ -73,9 +71,13 @@ impl<T: Copy> Align<T> {
}
}
fn calc_padding(adr: usize, align: usize) -> usize {
(align - adr % align) % align
}
impl<T> Align<T> {
pub unsafe fn new(ptr: *mut (), alignment: usize, size: usize) -> Self {
let offset = size_of::<T>() + size_of::<T>() % alignment;
let offset = size_of::<T>() + calc_padding(size_of::<T>(), alignment);
Align {
ptr,
offset,