alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2025-02-23 17:47:43 +11:00
Code Issues Projects Releases Packages Wiki Activity

Merge #67

Browse source 
67: Fix some null handles r=kvark a=grovesNL

Fixes some null handle CTS tests (from the wiki):
- dEQP-VK.api.null_handle.destroy_command_pool
- dEQP-VK.api.null_handle.destroy_device
- dEQP-VK.api.null_handle.free_command_buffers

Technically the `instance.unbox().unwrap().adapters` change wasn't needed for these three, but it may have been impacting other tests anyway.

Co-authored-by: Joshua Groves <josh@joshgroves.com>
This commit is contained in:
bors[bot] 2018-05-01 20:03:45 +00:00
commit 07fc60dad9
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libportability-gfx/src/impls.rs
View file

@ -60,8 +60,10 @@ pub extern "C" fn gfxDestroyInstance(
instance: VkInstance,
_pAllocator: *const VkAllocationCallbacks,
) {
for adapter in instance.unbox().unwrap().adapters {
let _ = adapter.unbox();
if let Some(i) = instance.unbox() {
for adapter in i.adapters {
let _ = adapter.unbox();
}
}
#[cfg(feature = "nightly")]
{
@ -571,9 +573,11 @@ pub extern "C" fn gfxCreateDevice(
#[inline]
pub extern "C" fn gfxDestroyDevice(gpu: VkDevice, _pAllocator: *const VkAllocationCallbacks) {
// release all the owned command queues
for (_, family) in gpu.unbox().unwrap().queues {
for queue in family {
let _ = queue.unbox();
if let Some(d) = gpu.unbox() {
for (_, family) in d.queues {
for queue in family {
let _ = queue.unbox();
}
}
}
}
@ -2519,11 +2523,12 @@ pub extern "C" fn gfxDestroyCommandPool(
commandPool: VkCommandPool,
_pAllocator: *const VkAllocationCallbacks,
) {
let pool = commandPool.unbox().unwrap();
for cmd_buf in pool.buffers {
let _ = cmd_buf.unbox();
if let Some(cp) = commandPool.unbox() {
for cmd_buf in cp.buffers {
let _ = cmd_buf.unbox();
}
gpu.device.destroy_command_pool(cp.pool);
}
gpu.device.destroy_command_pool(pool.pool);
}
#[inline]
@ -2573,7 +2578,7 @@ pub extern "C" fn gfxFreeCommandBuffers(
};
commandPool.buffers.retain(|buf| !slice.contains(buf));
let buffers = slice.iter().map(|buffer| buffer.unbox().unwrap()).collect();
let buffers = slice.iter().filter_map(|buffer| buffer.unbox()).collect();
unsafe { commandPool.pool.free(buffers) };
}