From 60b3090d5d90561ef32865162c6e80b678d69584 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sun, 20 Aug 2023 00:47:07 +0200
Subject: [PATCH] vulkan: Add trace points for more Vulkan waiting functions.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24799>
---
 src/vulkan/runtime/vk_device.c    | 3 +++
 src/vulkan/runtime/vk_queue.c     | 3 +++
 src/vulkan/runtime/vk_semaphore.c | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/vulkan/runtime/vk_device.c b/src/vulkan/runtime/vk_device.c
index f67f064..8d1ff30 100644
--- a/src/vulkan/runtime/vk_device.c
+++ b/src/vulkan/runtime/vk_device.c
@@ -33,6 +33,7 @@
 #include "vk_util.h"
 #include "util/u_debug.h"
 #include "util/hash_table.h"
+#include "util/perf/cpu_trace.h"
 #include "util/ralloc.h"
 
 static enum vk_device_timeline_mode
@@ -522,6 +523,8 @@ vk_common_GetImageSparseMemoryRequirements(VkDevice _device,
 VKAPI_ATTR VkResult VKAPI_CALL
 vk_common_DeviceWaitIdle(VkDevice _device)
 {
+   MESA_TRACE_FUNC();
+
    VK_FROM_HANDLE(vk_device, device, _device);
    const struct vk_device_dispatch_table *disp = &device->dispatch_table;
 
diff --git a/src/vulkan/runtime/vk_queue.c b/src/vulkan/runtime/vk_queue.c
index cacca2f..a315c6f 100644
--- a/src/vulkan/runtime/vk_queue.c
+++ b/src/vulkan/runtime/vk_queue.c
@@ -23,6 +23,7 @@
 
 #include "vk_queue.h"
 
+#include "util/perf/cpu_trace.h"
 #include "util/u_debug.h"
 #include <inttypes.h>
 
@@ -1293,6 +1294,8 @@ get_cpu_wait_type(struct vk_physical_device *pdevice)
 VKAPI_ATTR VkResult VKAPI_CALL
 vk_common_QueueWaitIdle(VkQueue _queue)
 {
+   MESA_TRACE_FUNC();
+
    VK_FROM_HANDLE(vk_queue, queue, _queue);
    VkResult result;
 
diff --git a/src/vulkan/runtime/vk_semaphore.c b/src/vulkan/runtime/vk_semaphore.c
index abae89c..7044ed9 100644
--- a/src/vulkan/runtime/vk_semaphore.c
+++ b/src/vulkan/runtime/vk_semaphore.c
@@ -24,6 +24,7 @@
 #include "vk_semaphore.h"
 
 #include "util/os_time.h"
+#include "util/perf/cpu_trace.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -327,6 +328,8 @@ vk_common_WaitSemaphores(VkDevice _device,
                          const VkSemaphoreWaitInfo *pWaitInfo,
                          uint64_t timeout)
 {
+   MESA_TRACE_FUNC();
+
    VK_FROM_HANDLE(vk_device, device, _device);
 
    if (vk_device_is_lost(device))
-- 
2.7.4