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

Merge pull request #113 from tomaka/fix-use-after-free

Browse Source 
Fix a use-after-free when submitting a command buffer
This commit is contained in:
tomaka 2016-05-22 18:34:53 +02:00
commit 1050331e7f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vulkano/src/command_buffer/inner.rs
View File

@ -1960,14 +1960,18 @@ pub fn submit(me: &InnerCommandBuffer, me_arc: Arc<KeepAlive>,
unsafe {
let mut infos = SmallVec::<[_; 3]>::new();
if !before_command_buffers.is_empty() {
// TODO: Use try!()? - Mixthos
let signal_semaphore = if !before_command_buffers.is_empty() {
let semaphore = Semaphore::new(queue.device());
let semaphore_id = semaphore.internal_object();
pre_semaphores_stages.push(vk::PIPELINE_STAGE_TOP_OF_PIPE_BIT); // TODO:
pre_semaphores_ids.push(semaphore.internal_object());
keep_alive_semaphores.push(semaphore);
Some(semaphore_id)
} else {
None
};
if !before_command_buffers.is_empty() {
infos.push(vk::SubmitInfo {
sType: vk::STRUCTURE_TYPE_SUBMIT_INFO,
pNext: ptr::null(),
@ -1977,7 +1981,7 @@ pub fn submit(me: &InnerCommandBuffer, me_arc: Arc<KeepAlive>,
commandBufferCount: before_command_buffers.len() as u32,
pCommandBuffers: before_command_buffers.as_ptr(),
signalSemaphoreCount: 1,
pSignalSemaphores: &semaphore_id,
pSignalSemaphores: signal_semaphore.as_ref().map(|s| s as *const _).unwrap(),
});
}