From cc88dcec71d128302f08fcb00d046c53c83ee756 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Mon, 14 Apr 2025 17:11:30 +0100 Subject: [PATCH] st/oxr: Make it possible to build without DPAD support Part-of: --- src/xrt/state_trackers/oxr/oxr_api_action.c | 8 ++++++-- src/xrt/state_trackers/oxr/oxr_verify.c | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/xrt/state_trackers/oxr/oxr_api_action.c b/src/xrt/state_trackers/oxr/oxr_api_action.c index 4a311f332..5a5457c5c 100644 --- a/src/xrt/state_trackers/oxr/oxr_api_action.c +++ b/src/xrt/state_trackers/oxr/oxr_api_action.c @@ -1,5 +1,5 @@ // Copyright 2019-2023, Collabora, Ltd. -// Copyright 2023, NVIDIA CORPORATION. +// Copyright 2023-2025, NVIDIA CORPORATION. // SPDX-License-Identifier: BSL-1.0 /*! * @file @@ -238,7 +238,11 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance, path_verify_fn_t dpad_path_fn = NULL; path_verify_fn_t dpad_emulator_fn = NULL; ext_verify_fn_t ext_verify_fn = NULL; - bool has_dpad = inst->extensions.EXT_dpad_binding; +#ifdef OXR_HAVE_EXT_dpad_binding + const bool has_dpad = inst->extensions.EXT_dpad_binding; +#else + const bool has_dpad = false; +#endif struct profile_template *interaction_profile_template = NULL; for (uint32_t i = 0; i < ARRAY_SIZE(profile_templates); i++) { diff --git a/src/xrt/state_trackers/oxr/oxr_verify.c b/src/xrt/state_trackers/oxr/oxr_verify.c index 892f45190..49760e9e7 100644 --- a/src/xrt/state_trackers/oxr/oxr_verify.c +++ b/src/xrt/state_trackers/oxr/oxr_verify.c @@ -1,4 +1,5 @@ // Copyright 2018-2022, Collabora, Ltd. +// Copyright 2025, NVIDIA CORPORATION. // SPDX-License-Identifier: BSL-1.0 /*! * @file @@ -424,10 +425,12 @@ oxr_verify_extensions(struct oxr_logger *log, const struct oxr_extension_status } #endif +#ifdef OXR_HAVE_EXT_dpad_binding if (extensions->EXT_dpad_binding && !extensions->KHR_binding_modification) { return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XR_EXT_dpad_binding requires XR_KHR_binding_modification"); } +#endif return XR_SUCCESS; } -- 2.51.2