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

Invalidate mapping when reading buffer

Browse Source
This commit is contained in:
Pierre Krieger 2016-02-18 16:45:04 +01:00
parent 8d60908f5c
commit 5941198d90
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vulkano/src/memory/single.rs
View File

@ -204,6 +204,7 @@ unsafe impl<'a, T: 'a> CpuWriteAccessible<'a, T> for HostVisibleChunk { //
#[inline] #[inline]
fn write(&'a self, timeout_ns: u64) -> GpuAccess<'a, T> { fn write(&'a self, timeout_ns: u64) -> GpuAccess<'a, T> {
let vk = self.mem.memory().device().pointers();
let pointer = self.mem.mapping_pointer() as *mut T; let pointer = self.mem.mapping_pointer() as *mut T;
let mut lock = self.lock.lock().unwrap(); let mut lock = self.lock.lock().unwrap();
@ -212,7 +213,20 @@ unsafe impl<'a, T: 'a> CpuWriteAccessible<'a, T> for HostVisibleChunk { //
} }
lock.1 = None; lock.1 = None;
// TODO: invalidate // TODO: only invalidate if necessary
let range = vk::MappedMemoryRange {
sType: vk::STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
pNext: ptr::null(),
memory: self.mem.memory().internal_object(),
offset: 0,
size: vk::WHOLE_SIZE,
};
// TODO: check result?
unsafe {
vk.InvalidateMappedMemoryRanges(self.mem.memory().device().internal_object(),
1, &range);
}
GpuAccess { GpuAccess {
mem: &self.mem, mem: &self.mem,
@ -223,6 +237,7 @@ unsafe impl<'a, T: 'a> CpuWriteAccessible<'a, T> for HostVisibleChunk { //
#[inline] #[inline]
fn try_write(&'a self) -> Option<GpuAccess<'a, T>> { fn try_write(&'a self) -> Option<GpuAccess<'a, T>> {
let vk = self.mem.memory().device().pointers();
let pointer = self.mem.mapping_pointer() as *mut T; let pointer = self.mem.mapping_pointer() as *mut T;
let mut lock = match self.lock.try_lock() { let mut lock = match self.lock.try_lock() {
@ -239,7 +254,20 @@ unsafe impl<'a, T: 'a> CpuWriteAccessible<'a, T> for HostVisibleChunk { //
lock.1 = None; lock.1 = None;
// TODO: invalidate // TODO: only invalidate if necessary
let range = vk::MappedMemoryRange {
sType: vk::STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
pNext: ptr::null(),
memory: self.mem.memory().internal_object(),
offset: 0,
size: vk::WHOLE_SIZE,
};
// TODO: check result?
unsafe {
vk.InvalidateMappedMemoryRanges(self.mem.memory().device().internal_object(),
1, &range);
}
Some(GpuAccess { Some(GpuAccess {
mem: &self.mem, mem: &self.mem,