mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-04 13:47:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Always create the system compositor

Browse source 
Some apps will enable headless and vulkan, then use Vulkan.
This commit is contained in:
Jakob Bornecrantz 2023-05-04 23:13:21 +01:00
parent beffe1bf0f
commit d79678aeec
1 changed files with 7 additions and 4 deletions

11
src/xrt/state_trackers/oxr/oxr_instance.c
View file

@ -269,8 +269,11 @@ oxr_instance_create(struct oxr_logger *log,
struct oxr_system *sys = &inst->system;
// Create the compositor if we are not headless.
if (!inst->extensions.MND_headless) {
// Create the compositor if we are not headless, currently always create it.
bool should_create_compositor = true /* !inst->extensions.MND_headless */;
// Create the system.
if (should_create_compositor) {
xret = xrt_instance_create_system(inst->xinst, &sys->xsysd, &sys->xso, &sys->xsysc);
} else {
xret = xrt_instance_create_system(inst->xinst, &sys->xsysd, &sys->xso, NULL);
@ -285,9 +288,9 @@ oxr_instance_create(struct oxr_logger *log,
ret = XR_SUCCESS;
if (sys->xsysd == NULL) {
ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Huh?! Field sys->xsysd was NULL?");
} else if (!inst->extensions.MND_headless && sys->xsysc == NULL) {
} else if (should_create_compositor && sys->xsysc == NULL) {
ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Huh?! Field sys->xsysc was NULL?");
} else if (inst->extensions.MND_headless && sys->xsysc != NULL) {
} else if (!should_create_compositor && sys->xsysc != NULL) {
ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Huh?! Field sys->xsysc was not NULL?");
}