The open source OpenXR runtime
st/oxr: Make it possible to build without DPAD support
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2619>
authored by
Jakob Bornecrantz
and committed by
Marge Bot
cc88dcec
b334f9d7
+9
-2
+6
-2
src/xrt/state_trackers/oxr/oxr_api_action.c
+6
-2
src/xrt/state_trackers/oxr/oxr_api_action.c
···
1
1
// Copyright 2019-2023, Collabora, Ltd.
2
-
// Copyright 2023, NVIDIA CORPORATION.
2
+
// Copyright 2023-2025, NVIDIA CORPORATION.
3
3
// SPDX-License-Identifier: BSL-1.0
4
4
/*!
5
5
* @file
···
238
238
path_verify_fn_t dpad_path_fn = NULL;
239
239
path_verify_fn_t dpad_emulator_fn = NULL;
240
240
ext_verify_fn_t ext_verify_fn = NULL;
241
-
bool has_dpad = inst->extensions.EXT_dpad_binding;
241
+
#ifdef OXR_HAVE_EXT_dpad_binding
242
+
const bool has_dpad = inst->extensions.EXT_dpad_binding;
243
+
#else
244
+
const bool has_dpad = false;
245
+
#endif
242
246
243
247
struct profile_template *interaction_profile_template = NULL;
244
248
for (uint32_t i = 0; i < ARRAY_SIZE(profile_templates); i++) {
+3
src/xrt/state_trackers/oxr/oxr_verify.c
+3
src/xrt/state_trackers/oxr/oxr_verify.c
···
1
1
// Copyright 2018-2022, Collabora, Ltd.
2
+
// Copyright 2025, NVIDIA CORPORATION.
2
3
// SPDX-License-Identifier: BSL-1.0
3
4
/*!
4
5
* @file
···
424
425
}
425
426
#endif
426
427
428
+
#ifdef OXR_HAVE_EXT_dpad_binding
427
429
if (extensions->EXT_dpad_binding && !extensions->KHR_binding_modification) {
428
430
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
429
431
"XR_EXT_dpad_binding requires XR_KHR_binding_modification");
430
432
}
433
+
#endif
431
434
432
435
return XR_SUCCESS;
433
436
}