From 9fc992d540f544ee6b069d0ed86ccdd738450a8a Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 9 Nov 2021 10:04:07 -0600 Subject: [PATCH] a/vk: Normalize member names in extensions --- src/xrt/auxiliary/vk/vk_helpers.c | 8 ++++---- src/xrt/auxiliary/vk/vk_helpers.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xrt/auxiliary/vk/vk_helpers.c b/src/xrt/auxiliary/vk/vk_helpers.c index 4715a37a2..4ee036d09 100644 --- a/src/xrt/auxiliary/vk/vk_helpers.c +++ b/src/xrt/auxiliary/vk/vk_helpers.c @@ -1223,7 +1223,7 @@ fill_in_has_extensions(struct vk_bundle *vk, const char **device_extensions, uin // Reset before filling out. vk->has_GOOGLE_display_timing = false; vk->has_EXT_global_priority = false; - vk->has_VK_EXT_robustness2 = false; + vk->has_EXT_robustness2 = false; for (uint32_t i = 0; i < num_device_extensions; i++) { const char *ext = device_extensions[i]; @@ -1236,7 +1236,7 @@ fill_in_has_extensions(struct vk_bundle *vk, const char **device_extensions, uin } #ifdef VK_EXT_robustness2 if (strcmp(ext, VK_EXT_ROBUSTNESS_2_EXTENSION_NAME) == 0) { - vk->has_VK_EXT_robustness2 = true; + vk->has_EXT_robustness2 = true; } #endif } @@ -1346,7 +1346,7 @@ filter_device_features(struct vk_bundle *vk, }; #ifdef VK_EXT_robustness2 - if (vk->has_VK_EXT_robustness2) { + if (vk->has_EXT_robustness2) { physical_device_features.pNext = physical_device_features.pNext; physical_device_features.pNext = (void *)&robust_info; } @@ -1475,7 +1475,7 @@ vk_create_device(struct vk_bundle *vk, }; #ifdef VK_EXT_robustness2 - if (vk->has_VK_EXT_robustness2) { + if (vk->has_EXT_robustness2) { // This struct is a in/out struct, while device_create_info has a const pNext. robust_info.pNext = (void *)device_create_info.pNext; device_create_info.pNext = (void *)&robust_info; diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h index bd6cb0c20..8e02feb79 100644 --- a/src/xrt/auxiliary/vk/vk_helpers.h +++ b/src/xrt/auxiliary/vk/vk_helpers.h @@ -50,7 +50,7 @@ struct vk_bundle bool has_GOOGLE_display_timing; bool has_EXT_global_priority; - bool has_VK_EXT_robustness2; + bool has_EXT_robustness2; bool is_tegra;