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

st/oxr: Check if user has already enabled timeline semaphores

Browse source 
We aren't allowed to add a second struct of the same type to the pNext
chain during Vulkan device creation.
This commit is contained in:
Boris-Chengbiao Zhou 2022-10-28 23:10:42 +02:00
parent 891a2c16e7
commit cd2f204414
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/xrt/state_trackers/oxr/oxr_vulkan.c
View file

@ -291,6 +291,18 @@ vk_get_device_features(struct oxr_logger *log,
return XR_SUCCESS;
}
static inline VkBaseInStructure const *
vk_find_struct_in_chain(const VkBaseInStructure *base, VkStructureType type)
{
while (base != NULL) {
if (base->sType == type) {
return base;
}
base = base->pNext;
}
return NULL;
}
XrResult
oxr_vk_create_vulkan_device(struct oxr_logger *log,
struct oxr_system *sys,
@ -393,13 +405,23 @@ oxr_vk_create_vulkan_device(struct oxr_logger *log,
};
if (timeline_semaphore_info.timelineSemaphore) {
/*
* Insert timeline semaphore request first to override
* any the app may have put on the next chain.
*/
// Have to cast away const.
timeline_semaphore.pNext = (void *)modified_info.pNext;
modified_info.pNext = &timeline_semaphore;
// Check if the user has already put the struct into the chain
const VkBaseInStructure *existing = vk_find_struct_in_chain(
(VkBaseInStructure *)&modified_info, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES);
if (existing != NULL) {
VkPhysicalDeviceTimelineSemaphoreFeatures *existing_timeline_semaphore_info =
(VkPhysicalDeviceTimelineSemaphoreFeatures *)existing;
if (!existing_timeline_semaphore_info->timelineSemaphore) {
oxr_warn(log, "Timeline semaphores are explicitly disabled by application");
timeline_semaphore_info.timelineSemaphore = VK_FALSE;
}
// Timeline semaphores are already enabled so we don't have to do anything
} else {
// Insert struct at the front of the chain
// Have to cast away const.
timeline_semaphore.pNext = (void *)modified_info.pNext;
modified_info.pNext = &timeline_semaphore;
}
}
#endif