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

a/vk: Track VK_EXT_swapchain_colorspace

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-12-13 16:15:28 +00:00
parent b7addee249
commit 7576ce0960
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/generate_vk_helpers.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright 2019-2021, Collabora, Ltd. # Copyright 2019-2022, Collabora, Ltd.
# SPDX-License-Identifier: BSL-1.0 # SPDX-License-Identifier: BSL-1.0
"""Simple script to update vk_helpers.{c,h}.""" """Simple script to update vk_helpers.{c,h}."""
@ -253,6 +253,7 @@ def get_instance_cmds():
# Sorted KHR, EXT, Vendor, interally alphabetically # Sorted KHR, EXT, Vendor, interally alphabetically
INSTANCE_EXTENSIONS_TO_CHECK = [ INSTANCE_EXTENSIONS_TO_CHECK = [
"VK_EXT_display_surface_counter", "VK_EXT_display_surface_counter",
"VK_EXT_swapchain_colorspace",
] ]
# Sorted KHR, EXT, Vendor, interally alphabetically # Sorted KHR, EXT, Vendor, interally alphabetically
DEVICE_EXTENSIONS_TO_CHECK = [ DEVICE_EXTENSIONS_TO_CHECK = [

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

@ -127,6 +127,7 @@ vk_fill_in_has_instance_extensions(struct vk_bundle *vk, struct u_string_list *e
// beginning of GENERATED instance extension code - do not modify - used by scripts // beginning of GENERATED instance extension code - do not modify - used by scripts
// Reset before filling out. // Reset before filling out.
vk->has_EXT_display_surface_counter = false; vk->has_EXT_display_surface_counter = false;
vk->has_EXT_swapchain_colorspace = false;
const char *const *exts = u_string_list_get_data(ext_list); const char *const *exts = u_string_list_get_data(ext_list);
uint32_t ext_count = u_string_list_get_size(ext_list); uint32_t ext_count = u_string_list_get_size(ext_list);
@ -140,6 +141,13 @@ vk_fill_in_has_instance_extensions(struct vk_bundle *vk, struct u_string_list *e
continue; continue;
} }
#endif // defined(VK_EXT_display_surface_counter) #endif // defined(VK_EXT_display_surface_counter)
#if defined(VK_EXT_swapchain_colorspace)
if (strcmp(ext, VK_EXT_SWAPCHAIN_COLORSPACE_EXTENSION_NAME) == 0) {
vk->has_EXT_swapchain_colorspace = true;
continue;
}
#endif // defined(VK_EXT_swapchain_colorspace)
} }
// end of GENERATED instance extension code - do not modify - used by scripts // end of GENERATED instance extension code - do not modify - used by scripts
} }

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

@ -115,6 +115,7 @@ struct vk_bundle
// beginning of GENERATED instance extension code - do not modify - used by scripts // beginning of GENERATED instance extension code - do not modify - used by scripts
bool has_EXT_display_surface_counter; bool has_EXT_display_surface_counter;
bool has_EXT_swapchain_colorspace;
// end of GENERATED instance extension code - do not modify - used by scripts // end of GENERATED instance extension code - do not modify - used by scripts
// beginning of GENERATED device extension code - do not modify - used by scripts // beginning of GENERATED device extension code - do not modify - used by scripts

3
src/xrt/include/xrt/xrt_vulkan_includes.h
View file

@ -30,6 +30,9 @@
#ifndef VK_KHR_MAINTENANCE_3_EXTENSION_NAME #ifndef VK_KHR_MAINTENANCE_3_EXTENSION_NAME
#define VK_KHR_MAINTENANCE_3_EXTENSION_NAME VK_KHR_MAINTENANCE3_EXTENSION_NAME #define VK_KHR_MAINTENANCE_3_EXTENSION_NAME VK_KHR_MAINTENANCE3_EXTENSION_NAME
#endif #endif
#ifndef VK_EXT_SWAPCHAIN_COLORSPACE_EXTENSION_NAME
#define VK_EXT_SWAPCHAIN_COLORSPACE_EXTENSION_NAME VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME
#endif
#if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) || defined(VK_USE_PLATFORM_XLIB_KHR) #if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) || defined(VK_USE_PLATFORM_XLIB_KHR)
// the xlib header is notoriously polluting. // the xlib header is notoriously polluting.