qonos: Add a wrapper for vkQueueWaitIdle

14 files changed, 28 insertions, 16 deletions

diff --git a/include/qonos/qonos.h b/include/qonos/qonos.h
index d620e9b..fe48503 100644
--- a/include/qonos/qonos.h
+++ b/include/qonos/qonos.h
@@ -484,6 +484,7 @@ void qoEnumeratePhysicalDevices(VkInstance instance, uint32_t *count, VkPhysical
 void qoGetPhysicalDeviceProperties(VkPhysicalDevice physical_dev, VkPhysicalDeviceProperties *properties);
 void qoGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physical_dev, VkPhysicalDeviceMemoryProperties *mem_props);
 VkResult qoQueueSubmit(VkQueue queue, uint32_t cmdBufferCount, const VkCommandBuffer *cmdBuffers, VkFence fence);
+VkResult qoQueueWaitIdle(VkQueue queue);
 VkDeviceMemory __qoAllocMemory(VkDevice dev, const VkMemoryAllocateInfo *info);
 VkDeviceMemory __qoAllocMemoryFromRequirements(VkDevice dev, const VkMemoryRequirements *mem_reqs, const VkMemoryAllocateInfo *override_info);
 VkDeviceMemory __qoAllocBufferMemory(VkDevice dev, VkBuffer buffer, const VkMemoryAllocateInfo *override_info);
diff --git a/src/framework/test/t_phases.c b/src/framework/test/t_phases.c
index f04e8d9..8ff2c7f 100644
--- a/src/framework/test/t_phases.c
+++ b/src/framework/test/t_phases.c
@@ -84,7 +84,7 @@ t_enter_precleanup_phase(void)
 
     if (t->vk.queue) {
         // Don't prematurely end the test before the test has completed executing.
-        vkQueueWaitIdle(t->vk.queue);
+        qoQueueWaitIdle(t->vk.queue);
     }
 
     if (!t->result_is_final && !t->def->no_image) {
diff --git a/src/qonos/qonos.c b/src/qonos/qonos.c
index 82a64e8..88d500b 100644
--- a/src/qonos/qonos.c
+++ b/src/qonos/qonos.c
@@ -110,6 +110,17 @@ qoQueueSubmit(VkQueue queue, uint32_t cmdBufferCount,
     return result;
 }
 
+VkResult
+qoQueueWaitIdle(VkQueue queue)
+{
+    VkResult result;
+
+    result = vkQueueWaitIdle(queue);
+    t_assert(result == VK_SUCCESS);
+
+    return result;
+}
+
 VkDeviceMemory
 __qoAllocMemory(VkDevice dev, const VkMemoryAllocateInfo *info)
 {
diff --git a/src/tests/func/compute-local-id.c b/src/tests/func/compute-local-id.c
index dcd10ae..0424c87 100644
--- a/src/tests/func/compute-local-id.c
+++ b/src/tests/func/compute-local-id.c
@@ -118,7 +118,7 @@ dispatch_and_wait(uint32_t x, uint32_t y, uint32_t z)
 
     qoEndCommandBuffer(t_cmd_buffer);
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 }
 
 static void
diff --git a/src/tests/func/compute-num-workgroups.c b/src/tests/func/compute-num-workgroups.c
index 543af9b..f41d058 100644
--- a/src/tests/func/compute-num-workgroups.c
+++ b/src/tests/func/compute-num-workgroups.c
@@ -133,7 +133,7 @@ dispatch_and_wait(CTX *ctx)
 
     qoEndCommandBuffer(t_cmd_buffer);
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     vkResetCommandBuffer(t_cmd_buffer, 0);
 }
@@ -210,7 +210,7 @@ indirect_dispatch_and_wait(CTX *ctx)
     vkUnmapMemory(t_device, ctx->ssbo);
 
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 }
 
 static void
diff --git a/src/tests/func/copy/copy-buffer.c b/src/tests/func/copy/copy-buffer.c
index f88af9e..fe03d84 100644
--- a/src/tests/func/copy/copy-buffer.c
+++ b/src/tests/func/copy/copy-buffer.c
@@ -98,7 +98,7 @@ test_large_copy(void)
 
     qoEndCommandBuffer(cmdBuffer);
     qoQueueSubmit(t_queue, 1, &cmdBuffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     for (unsigned i = 0; i < buffer_size / sizeof(*map32); i++) {
         t_assertf(map32[i] == map32_2[i],
diff --git a/src/tests/func/depthstencil/arrayed-clear.c b/src/tests/func/depthstencil/arrayed-clear.c
index cdf94bb..11eed0d 100644
--- a/src/tests/func/depthstencil/arrayed-clear.c
+++ b/src/tests/func/depthstencil/arrayed-clear.c
@@ -273,7 +273,7 @@ test(void)
     vkEndCommandBuffer(t_cmd_buffer);
 
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     // Compare the expected and actual values
     t_assertf(CLEAR_VALUE == buffer_map[0] &&
diff --git a/src/tests/func/event.c b/src/tests/func/event.c
index c6a686a..b5df10f 100644
--- a/src/tests/func/event.c
+++ b/src/tests/func/event.c
@@ -107,7 +107,7 @@ __create_and_wait(VkCommandBuffer *cmdBuffer)
 
 		qoQueueSubmit(t_queue, 1, cmdBuffer, VK_NULL_HANDLE);
 
-		vkQueueWaitIdle(t_queue);
+		qoQueueWaitIdle(t_queue);
 
 		return false;
 	}
@@ -216,7 +216,7 @@ test_event_wait_set_later(void)
     t_assert(result == VK_SUCCESS);
     t_assert(vkGetEventStatus(t_device, event_a) == VK_EVENT_SET);
 
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     t_assert(vkGetEventStatus(t_device, event_a) == VK_EVENT_SET);
     t_assert(vkGetEventStatus(t_device, event_b) == VK_EVENT_SET);
diff --git a/src/tests/func/interleaved-cmd-buffers.c b/src/tests/func/interleaved-cmd-buffers.c
index 0f82e2b..2db4fd5 100644
--- a/src/tests/func/interleaved-cmd-buffers.c
+++ b/src/tests/func/interleaved-cmd-buffers.c
@@ -139,13 +139,13 @@ test_end1_submit1_end2_submit2(void)
                            dest1.buffer, 1, &copy);
     qoEndCommandBuffer(dest1.cmd);
     qoQueueSubmit(t_queue, 1, &dest1.cmd, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     vkCmdCopyImageToBuffer(dest2.cmd, src.vk_image, VK_IMAGE_LAYOUT_GENERAL,
                            dest2.buffer, 1, &copy);
     qoEndCommandBuffer(dest2.cmd);
     qoQueueSubmit(t_queue, 1, &dest2.cmd, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     compare_images(&src, &dest1, &dest2);
 }
@@ -171,7 +171,7 @@ test_end1_end2_submit1_submit2(void)
 
     qoQueueSubmit(t_queue, 1, &dest1.cmd, VK_NULL_HANDLE);
     qoQueueSubmit(t_queue, 1, &dest2.cmd, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     compare_images(&src, &dest1, &dest2);
 }
diff --git a/src/tests/func/miptree/miptree.c b/src/tests/func/miptree/miptree.c
index 720621f..8f2186a 100644
--- a/src/tests/func/miptree/miptree.c
+++ b/src/tests/func/miptree/miptree.c
@@ -1107,7 +1107,7 @@ miptree_compare_images(const miptree_t *mt)
     const mipslice_t *slice;
     string_t slice_desc = STRING_INIT;
 
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     cru_vec_foreach(slice, &mt->mipslices) {
         mipslice_get_description(slice, &slice_desc);
diff --git a/src/tests/func/query/timestamp.c b/src/tests/func/query/timestamp.c
index e1358ef..ea7f683 100644
--- a/src/tests/func/query/timestamp.c
+++ b/src/tests/func/query/timestamp.c
@@ -44,7 +44,7 @@ get_timestamp(void)
 
     qoQueueSubmit(t_queue, 1, &cmdBuffer, VK_NULL_HANDLE);
 
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     uint64_t results[2];
     vkGetQueryPoolResults(t_device, pool, 0, 2,
diff --git a/src/tests/func/renderpass/clear.c b/src/tests/func/renderpass/clear.c
index 951965a..73ed246 100644
--- a/src/tests/func/renderpass/clear.c
+++ b/src/tests/func/renderpass/clear.c
@@ -229,7 +229,7 @@ test_color8(void)
 
     qoEndCommandBuffer(cmd);
     qoQueueSubmit(t_queue, 1, &cmd, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     test_result_t result = TEST_RESULT_PASS;
 
diff --git a/src/tests/func/ssbo/interleave.c b/src/tests/func/ssbo/interleave.c
index f7f72cc..5ff5a24 100644
--- a/src/tests/func/ssbo/interleave.c
+++ b/src/tests/func/ssbo/interleave.c
@@ -197,7 +197,7 @@ test(void)
     vkCmdEndRenderPass(t_cmd_buffer);
     qoEndCommandBuffer(t_cmd_buffer);
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     uint32_t *map_out = qoMapMemory(t_device, mem_out, 0, 4096, 0);
     for (unsigned i = 0; i < 1024; i++) {
diff --git a/src/tests/stress/lots-of-surface-state.c b/src/tests/stress/lots-of-surface-state.c
index 96d748e..a30b69a 100644
--- a/src/tests/stress/lots-of-surface-state.c
+++ b/src/tests/stress/lots-of-surface-state.c
@@ -728,7 +728,7 @@ test_lots_of_surface_state_cs(bool use_dynamic_offsets)
 
     qoEndCommandBuffer(t_cmd_buffer);
     qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
-    vkQueueWaitIdle(t_queue);
+    qoQueueWaitIdle(t_queue);
 
     float *const ssbo_map = qoMapMemory(t_device, ssbo_mem, /*offset*/ 0,
                                         ssbo_size, /*flags*/ 0);