mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-26 17:37:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/vk: Remove VK_EXT_debug_marker

Browse source
This commit is contained in:
Simon Zeni 2023-11-01 10:33:39 -04:00 committed by Jakob Bornecrantz
parent c7dc483b9a
commit 4a1ff65856
6 changed files with 2 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/vulkan-extensions.md
View file

@ -44,7 +44,7 @@ minimize frustration.
| [`VK_KHR_swapchain`][] | | yes ||||||
| [`VK_KHR_timeline_semaphore`][] | opt | opt | opt | opt | opt | opt | opt |
[`VK_EXT_debug_report`][] is also used.
[`VK_EXT_debug_utils`][] is also used.
## Notes
@ -88,7 +88,7 @@ Kept out of the preceding table to limit its width.
[`VK_KHR_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_display.html
[`VK_KHR_xcb_surface`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_xcb_surface.html
[`VK_KHR_wayland_surface`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_KHR_wayland_surface.html
[`VK_EXT_debug_report`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_debug_report.html
[`VK_EXT_debug_utils`]: https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_debug_utils.html
[`VK_EXT_direct_mode_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_direct_mode_display.html
[`VK_EXT_acquire_xlib_display`]: https://khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VK_EXT_acquire_xlib_display.html
[`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
View file

@ -179,12 +179,6 @@ def get_device_cmds():
Cmd("vkQueueInsertDebugUtilsLabelEXT", requires=("VK_EXT_debug_utils",)),
Cmd("vkSetDebugUtilsObjectNameEXT", requires=("VK_EXT_debug_utils",)),
Cmd("vkSetDebugUtilsObjectTagEXT", requires=("VK_EXT_debug_utils",)),
None,
Cmd("vkCmdDebugMarkerBeginEXT", requires=("VK_EXT_debug_marker",)),
Cmd("vkCmdDebugMarkerEndEXT", requires=("VK_EXT_debug_marker",)),
Cmd("vkCmdDebugMarkerInsertEXT", requires=("VK_EXT_debug_marker",)),
Cmd("vkDebugMarkerSetObjectNameEXT", requires=("VK_EXT_debug_marker",)),
Cmd("vkDebugMarkerSetObjectTagEXT", requires=("VK_EXT_debug_marker",)),
]
@ -289,7 +283,6 @@ DEVICE_EXTENSIONS_TO_CHECK = [
"VK_KHR_maintenance4",
"VK_KHR_timeline_semaphore",
"VK_EXT_calibrated_timestamps",
"VK_EXT_debug_marker",
"VK_EXT_display_control",
"VK_EXT_external_memory_dma_buf",
"VK_EXT_global_priority",

8
src/xrt/auxiliary/vk/vk_bundle_init.c
View file

@ -750,7 +750,6 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li
vk->has_KHR_maintenance4 = false;
vk->has_KHR_timeline_semaphore = false;
vk->has_EXT_calibrated_timestamps = false;
vk->has_EXT_debug_marker = false;
vk->has_EXT_display_control = false;
vk->has_EXT_external_memory_dma_buf = false;
vk->has_EXT_global_priority = false;
@ -841,13 +840,6 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li
}
#endif // defined(VK_EXT_calibrated_timestamps)
#if defined(VK_EXT_debug_marker)
if (strcmp(ext, VK_EXT_DEBUG_MARKER_EXTENSION_NAME) == 0) {
vk->has_EXT_debug_marker = true;
continue;
}
#endif // defined(VK_EXT_debug_marker)
#if defined(VK_EXT_display_control)
if (strcmp(ext, VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME) == 0) {
vk->has_EXT_display_control = true;

9
src/xrt/auxiliary/vk/vk_function_loaders.c
View file

@ -326,17 +326,8 @@ vk_get_device_functions(struct vk_bundle *vk)
vk->vkQueueInsertDebugUtilsLabelEXT = GET_DEV_PROC(vk, vkQueueInsertDebugUtilsLabelEXT);
vk->vkSetDebugUtilsObjectNameEXT = GET_DEV_PROC(vk, vkSetDebugUtilsObjectNameEXT);
vk->vkSetDebugUtilsObjectTagEXT = GET_DEV_PROC(vk, vkSetDebugUtilsObjectTagEXT);
#endif // defined(VK_EXT_debug_utils)
#if defined(VK_EXT_debug_marker)
vk->vkCmdDebugMarkerBeginEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerBeginEXT);
vk->vkCmdDebugMarkerEndEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerEndEXT);
vk->vkCmdDebugMarkerInsertEXT = GET_DEV_PROC(vk, vkCmdDebugMarkerInsertEXT);
vk->vkDebugMarkerSetObjectNameEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectNameEXT);
vk->vkDebugMarkerSetObjectTagEXT = GET_DEV_PROC(vk, vkDebugMarkerSetObjectTagEXT);
#endif // defined(VK_EXT_debug_marker)
// end of GENERATED device loader code - do not modify - used by scripts
// clang-format on
return VK_SUCCESS;

10
src/xrt/auxiliary/vk/vk_helpers.h
View file

@ -131,7 +131,6 @@ struct vk_bundle
bool has_KHR_maintenance4;
bool has_KHR_timeline_semaphore;
bool has_EXT_calibrated_timestamps;
bool has_EXT_debug_marker;
bool has_EXT_display_control;
bool has_EXT_external_memory_dma_buf;
bool has_EXT_global_priority;
@ -434,17 +433,8 @@ struct vk_bundle
PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT;
PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
#endif // defined(VK_EXT_debug_utils)
#if defined(VK_EXT_debug_marker)
PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT;
PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT;
PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT;
#endif // defined(VK_EXT_debug_marker)
// end of GENERATED device loader code - do not modify - used by scripts
};

3
src/xrt/compositor/main/comp_compositor.c
View file

@ -542,9 +542,6 @@ static const char *optional_device_extensions[] = {
#ifdef VK_KHR_timeline_semaphore
VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME,
#endif
#if defined VK_EXT_debug_marker && !defined NDEBUG
VK_EXT_DEBUG_MARKER_EXTENSION_NAME,
#endif
#ifdef VK_EXT_calibrated_timestamps
VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME,
#endif