matrixfurry.com / monado
The open source OpenXR runtime
fork atom

a/vk: Remove VK_EXT_debug_marker

authored by Simon Zeni and committed by Jakob Bornecrantz 4a1ff658 c7dc483b

options
unified split
Changed files
+2 -39
doc
vulkan-extensions.md
scripts
generate_vk_helpers.py
src
xrt
auxiliary
vk
vk_bundle_init.c
vk_function_loaders.c
vk_helpers.h
compositor
main
comp_compositor.c
+2 -2
doc/vulkan-extensions.md
··· 44 44 | [`VK_KHR_swapchain`][] | | yes |||||| 45 45 | [`VK_KHR_timeline_semaphore`][] | opt | opt | opt | opt | opt | opt | opt | 46 46 47 - [`VK_EXT_debug_report`][] is also used. 47 + [`VK_EXT_debug_utils`][] is also used. 48 48 49 49 ## Notes 50 50 ··· 88 88 [`VK_KHR_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_display.html 89 89 [`VK_KHR_xcb_surface`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_xcb_surface.html 90 90 [`VK_KHR_wayland_surface`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_wayland_surface.html 91 - [`VK_EXT_debug_report`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_debug_report.html 91 + [`VK_EXT_debug_utils`]: https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_debug_utils.html 92 92 [`VK_EXT_direct_mode_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_direct_mode_display.html 93 93 [`VK_EXT_acquire_xlib_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_acquire_xlib_display.html 94 94 [`VK_KHR_android_surface`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_android_surface.html
-7
scripts/generate_vk_helpers.py
··· 179 179 Cmd("vkQueueInsertDebugUtilsLabelEXT", requires=("VK_EXT_debug_utils",)), 180 180 Cmd("vkSetDebugUtilsObjectNameEXT", requires=("VK_EXT_debug_utils",)), 181 181 Cmd("vkSetDebugUtilsObjectTagEXT", requires=("VK_EXT_debug_utils",)), 182 - None, 183 - Cmd("vkCmdDebugMarkerBeginEXT", requires=("VK_EXT_debug_marker",)), 184 - Cmd("vkCmdDebugMarkerEndEXT", requires=("VK_EXT_debug_marker",)), 185 - Cmd("vkCmdDebugMarkerInsertEXT", requires=("VK_EXT_debug_marker",)), 186 - Cmd("vkDebugMarkerSetObjectNameEXT", requires=("VK_EXT_debug_marker",)), 187 - Cmd("vkDebugMarkerSetObjectTagEXT", requires=("VK_EXT_debug_marker",)), 188 182 ] 189 183 190 184 ··· 289 283 "VK_KHR_maintenance4", 290 284 "VK_KHR_timeline_semaphore", 291 285 "VK_EXT_calibrated_timestamps", 292 - "VK_EXT_debug_marker", 293 286 "VK_EXT_display_control", 294 287 "VK_EXT_external_memory_dma_buf", 295 288 "VK_EXT_global_priority",
-8
src/xrt/auxiliary/vk/vk_bundle_init.c
··· 750 750 vk->has_KHR_maintenance4 = false; 751 751 vk->has_KHR_timeline_semaphore = false; 752 752 vk->has_EXT_calibrated_timestamps = false; 753 - vk->has_EXT_debug_marker = false; 754 753 vk->has_EXT_display_control = false; 755 754 vk->has_EXT_external_memory_dma_buf = false; 756 755 vk->has_EXT_global_priority = false; ··· 840 839 continue; 841 840 } 842 841 #endif // defined(VK_EXT_calibrated_timestamps) 843 - 844 - #if defined(VK_EXT_debug_marker) 845 - if (strcmp(ext, VK_EXT_DEBUG_MARKER_EXTENSION_NAME) == 0) { 846 - vk->has_EXT_debug_marker = true; 847 - continue; 848 - } 849 - #endif // defined(VK_EXT_debug_marker) 850 842 851 843 #if defined(VK_EXT_display_control) 852 844 if (strcmp(ext, VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME) == 0) {
-9
src/xrt/auxiliary/vk/vk_function_loaders.c
··· 326 326 vk->vkQueueInsertDebugUtilsLabelEXT = GET_DEV_PROC(vk, vkQueueInsertDebugUtilsLabelEXT); 327 327 vk->vkSetDebugUtilsObjectNameEXT = GET_DEV_PROC(vk, vkSetDebugUtilsObjectNameEXT); 328 328 vk->vkSetDebugUtilsObjectTagEXT = GET_DEV_PROC(vk, vkSetDebugUtilsObjectTagEXT); 329 - 330 329 #endif // defined(VK_EXT_debug_utils) 331 - 332 - #if defined(VK_EXT_debug_marker) 333 - vk->vkCmdDebugMarkerBeginEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerBeginEXT); 334 - vk->vkCmdDebugMarkerEndEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerEndEXT); 335 - vk->vkCmdDebugMarkerInsertEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerInsertEXT); 336 - vk->vkDebugMarkerSetObjectNameEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectNameEXT); 337 - vk->vkDebugMarkerSetObjectTagEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectTagEXT); 338 - #endif // defined(VK_EXT_debug_marker) 339 330 340 331 // end of GENERATED device loader code - do not modify - used by scripts 341 332 // clang-format on
-10
src/xrt/auxiliary/vk/vk_helpers.h
··· 131 131 bool has_KHR_maintenance4; 132 132 bool has_KHR_timeline_semaphore; 133 133 bool has_EXT_calibrated_timestamps; 134 - bool has_EXT_debug_marker; 135 134 bool has_EXT_display_control; 136 135 bool has_EXT_external_memory_dma_buf; 137 136 bool has_EXT_global_priority; ··· 434 433 PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT; 435 434 PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT; 436 435 PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT; 437 - 438 436 #endif // defined(VK_EXT_debug_utils) 439 - 440 - #if defined(VK_EXT_debug_marker) 441 - PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT; 442 - PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT; 443 - PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT; 444 - PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT; 445 - PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT; 446 - #endif // defined(VK_EXT_debug_marker) 447 437 448 438 // end of GENERATED device loader code - do not modify - used by scripts 449 439 };
-3
src/xrt/compositor/main/comp_compositor.c
··· 542 542 #ifdef VK_KHR_timeline_semaphore 543 543 VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME, 544 544 #endif 545 - #if defined VK_EXT_debug_marker && !defined NDEBUG 546 - VK_EXT_DEBUG_MARKER_EXTENSION_NAME, 547 - #endif 548 545 #ifdef VK_EXT_calibrated_timestamps 549 546 VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME, 550 547 #endif