From b7addee24965c6fdddb8793b7803d5124e951658 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 15 Dec 2022 11:44:31 +0000 Subject: [PATCH] a/vk: Track VK_KHR_format_feature_flags2 --- scripts/generate_vk_helpers.py | 1 + src/xrt/auxiliary/vk/vk_bundle_init.c | 8 ++++++++ src/xrt/auxiliary/vk/vk_helpers.h | 1 + 3 files changed, 10 insertions(+) diff --git a/scripts/generate_vk_helpers.py b/scripts/generate_vk_helpers.py index d3fa062aa..1f066aab5 100755 --- a/scripts/generate_vk_helpers.py +++ b/scripts/generate_vk_helpers.py @@ -258,6 +258,7 @@ INSTANCE_EXTENSIONS_TO_CHECK = [ DEVICE_EXTENSIONS_TO_CHECK = [ "VK_KHR_external_fence_fd", "VK_KHR_external_semaphore_fd", + "VK_KHR_format_feature_flags2", "VK_KHR_global_priority", "VK_KHR_image_format_list", "VK_KHR_maintenance1", diff --git a/src/xrt/auxiliary/vk/vk_bundle_init.c b/src/xrt/auxiliary/vk/vk_bundle_init.c index 2d32bcb88..1a334b79b 100644 --- a/src/xrt/auxiliary/vk/vk_bundle_init.c +++ b/src/xrt/auxiliary/vk/vk_bundle_init.c @@ -641,6 +641,7 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li // Reset before filling out. vk->has_KHR_external_fence_fd = false; vk->has_KHR_external_semaphore_fd = false; + vk->has_KHR_format_feature_flags2 = false; vk->has_KHR_global_priority = false; vk->has_KHR_image_format_list = false; vk->has_KHR_maintenance1 = false; @@ -676,6 +677,13 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li } #endif // defined(VK_KHR_external_semaphore_fd) +#if defined(VK_KHR_format_feature_flags2) + if (strcmp(ext, VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME) == 0) { + vk->has_KHR_format_feature_flags2 = true; + continue; + } +#endif // defined(VK_KHR_format_feature_flags2) + #if defined(VK_KHR_global_priority) if (strcmp(ext, VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME) == 0) { vk->has_KHR_global_priority = true; diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h index 214f8a0f9..0ba2535b0 100644 --- a/src/xrt/auxiliary/vk/vk_helpers.h +++ b/src/xrt/auxiliary/vk/vk_helpers.h @@ -120,6 +120,7 @@ struct vk_bundle // beginning of GENERATED device extension code - do not modify - used by scripts bool has_KHR_external_fence_fd; bool has_KHR_external_semaphore_fd; + bool has_KHR_format_feature_flags2; bool has_KHR_global_priority; bool has_KHR_image_format_list; bool has_KHR_maintenance1;