From 0f257e1bedc368113b4e4a5eb52859179e621956 Mon Sep 17 00:00:00 2001
From: Zhongwang Zhang <quic_zhozhan@quicinc.com>
Date: Mon, 6 Nov 2023 16:26:25 +0800
Subject: [PATCH] xrt: Enable passing down VK_EXT_debug_utils enabled status

---
 src/xrt/compositor/client/comp_vk_glue.c        | 1 +
 src/xrt/include/xrt/xrt_gfx_vk.h                | 1 +
 src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c | 1 +
 tests/tests_comp_client_vulkan.cpp              | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/xrt/compositor/client/comp_vk_glue.c b/src/xrt/compositor/client/comp_vk_glue.c
index 25e44137d..a9a778881 100644
--- a/src/xrt/compositor/client/comp_vk_glue.c
+++ b/src/xrt/compositor/client/comp_vk_glue.c
@@ -72,6 +72,7 @@ xrt_gfx_vk_provider_create(struct xrt_compositor_native *xcn,
                            bool external_fence_fd_enabled,
                            bool external_semaphore_fd_enabled,
                            bool timeline_semaphore_enabled,
+                           bool debug_utils_enabled,
                            uint32_t queue_family_index,
                            uint32_t queue_index)
 {
diff --git a/src/xrt/include/xrt/xrt_gfx_vk.h b/src/xrt/include/xrt/xrt_gfx_vk.h
index 0a48b2be0..ce2eef817 100644
--- a/src/xrt/include/xrt/xrt_gfx_vk.h
+++ b/src/xrt/include/xrt/xrt_gfx_vk.h
@@ -64,6 +64,7 @@ xrt_gfx_vk_provider_create(struct xrt_compositor_native *xcn,
                            bool external_fence_fd_enabled,
                            bool external_semaphore_fd_enabled,
                            bool timeline_semaphore_enabled,
+                           bool debug_utils_enabled,
                            uint32_t queue_family_index,
                            uint32_t queue_index);
 
diff --git a/src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c
index ebb7b3ec4..c5d7ea60c 100644
--- a/src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c
+++ b/src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c
@@ -119,6 +119,7 @@ oxr_session_populate_vk(struct oxr_logger *log,
 	    external_fence_fd_enabled,                               //
 	    external_semaphore_fd_enabled,                           //
 	    timeline_semaphore_enabled,                              //
+	    false,                                                   //
 	    next->queueFamilyIndex,                                  //
 	    next->queueIndex);                                       //
 
diff --git a/tests/tests_comp_client_vulkan.cpp b/tests/tests_comp_client_vulkan.cpp
index 546a778fb..a8bcad5b9 100644
--- a/tests/tests_comp_client_vulkan.cpp
+++ b/tests/tests_comp_client_vulkan.cpp
@@ -143,6 +143,7 @@ TEST_CASE("client_compositor", "[.][needgpu]")
 #else
 #error "Need port for fence sync handles checkers"
 #endif
+	    false,                  // debug_utils_enabled
 	    vk->queue_family_index, //
 	    vk->queue_index);
 	struct xrt_compositor *xc = &xcvk->base;