The open source OpenXR runtime
a/vk: Add VK_EXT_debug_marker
+37
-3
+8
-1
scripts/generate_vk_helpers.py
+8
-1
scripts/generate_vk_helpers.py
···
1
1
#!/usr/bin/env python3
2
-
# Copyright 2019-2022, Collabora, Ltd.
2
+
# Copyright 2019-2023, Collabora, Ltd.
3
3
# SPDX-License-Identifier: BSL-1.0
4
4
"""Simple script to update vk_helpers.{c,h}."""
5
5
···
170
170
Cmd("vkRegisterDisplayEventEXT", requires=("VK_EXT_display_control",)),
171
171
None,
172
172
Cmd("vkGetImageDrmFormatModifierPropertiesEXT", requires=("VK_EXT_image_drm_format_modifier",)),
173
+
None,
174
+
Cmd("vkCmdDebugMarkerBeginEXT", requires=("VK_EXT_debug_marker",)),
175
+
Cmd("vkCmdDebugMarkerEndEXT", requires=("VK_EXT_debug_marker",)),
176
+
Cmd("vkCmdDebugMarkerInsertEXT", requires=("VK_EXT_debug_marker",)),
177
+
Cmd("vkDebugMarkerSetObjectNameEXT", requires=("VK_EXT_debug_marker",)),
178
+
Cmd("vkDebugMarkerSetObjectTagEXT", requires=("VK_EXT_debug_marker",)),
173
179
]
174
180
175
181
···
269
275
"VK_KHR_maintenance4",
270
276
"VK_KHR_timeline_semaphore",
271
277
"VK_EXT_calibrated_timestamps",
278
+
"VK_EXT_debug_marker",
272
279
"VK_EXT_display_control",
273
280
"VK_EXT_external_memory_dma_buf",
274
281
"VK_EXT_global_priority",
+8
src/xrt/auxiliary/vk/vk_bundle_init.c
+8
src/xrt/auxiliary/vk/vk_bundle_init.c
···
657
657
vk->has_KHR_maintenance4 = false;
658
658
vk->has_KHR_timeline_semaphore = false;
659
659
vk->has_EXT_calibrated_timestamps = false;
660
+
vk->has_EXT_debug_marker = false;
660
661
vk->has_EXT_display_control = false;
661
662
vk->has_EXT_external_memory_dma_buf = false;
662
663
vk->has_EXT_global_priority = false;
···
746
747
continue;
747
748
}
748
749
#endif // defined(VK_EXT_calibrated_timestamps)
750
+
751
+
#if defined(VK_EXT_debug_marker)
752
+
if (strcmp(ext, VK_EXT_DEBUG_MARKER_EXTENSION_NAME) == 0) {
753
+
vk->has_EXT_debug_marker = true;
754
+
continue;
755
+
}
756
+
#endif // defined(VK_EXT_debug_marker)
749
757
750
758
#if defined(VK_EXT_display_control)
751
759
if (strcmp(ext, VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME) == 0) {
+10
-1
src/xrt/auxiliary/vk/vk_function_loaders.c
+10
-1
src/xrt/auxiliary/vk/vk_function_loaders.c
···
1
-
// Copyright 2019-2022, Collabora, Ltd.
1
+
// Copyright 2019-2023, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
307
307
308
308
#if defined(VK_EXT_image_drm_format_modifier)
309
309
vk->vkGetImageDrmFormatModifierPropertiesEXT = GET_DEV_PROC(vk, vkGetImageDrmFormatModifierPropertiesEXT);
310
+
310
311
#endif // defined(VK_EXT_image_drm_format_modifier)
312
+
313
+
#if defined(VK_EXT_debug_marker)
314
+
vk->vkCmdDebugMarkerBeginEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerBeginEXT);
315
+
vk->vkCmdDebugMarkerEndEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerEndEXT);
316
+
vk->vkCmdDebugMarkerInsertEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerInsertEXT);
317
+
vk->vkDebugMarkerSetObjectNameEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectNameEXT);
318
+
vk->vkDebugMarkerSetObjectTagEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectTagEXT);
319
+
#endif // defined(VK_EXT_debug_marker)
311
320
312
321
// end of GENERATED device loader code - do not modify - used by scripts
313
322
// clang-format on
+11
-1
src/xrt/auxiliary/vk/vk_helpers.h
+11
-1
src/xrt/auxiliary/vk/vk_helpers.h
···
1
-
// Copyright 2019-2022, Collabora, Ltd.
1
+
// Copyright 2019-2023, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
130
130
bool has_KHR_maintenance4;
131
131
bool has_KHR_timeline_semaphore;
132
132
bool has_EXT_calibrated_timestamps;
133
+
bool has_EXT_debug_marker;
133
134
bool has_EXT_display_control;
134
135
bool has_EXT_external_memory_dma_buf;
135
136
bool has_EXT_global_priority;
···
413
414
414
415
#if defined(VK_EXT_image_drm_format_modifier)
415
416
PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT;
417
+
416
418
#endif // defined(VK_EXT_image_drm_format_modifier)
419
+
420
+
#if defined(VK_EXT_debug_marker)
421
+
PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
422
+
PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
423
+
PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT;
424
+
PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT;
425
+
PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT;
426
+
#endif // defined(VK_EXT_debug_marker)
417
427
418
428
// end of GENERATED device loader code - do not modify - used by scripts
419
429
};