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: Add XR_OPPO_controller_interaction extension

Browse source
This commit is contained in:
quic_zhozhan 2023-07-17 14:10:41 +08:00 committed by Jakob Bornecrantz
parent 191e7d6269
commit 6aea10f57b
6 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/generate_oxr_ext_support.py
View file

@ -64,6 +64,7 @@ EXTENSIONS = (
['XR_MND_headless'], ['XR_MND_headless'],
['XR_MND_swapchain_usage_input_attachment_bit'], ['XR_MND_swapchain_usage_input_attachment_bit'],
['XR_MSFT_hand_interaction', 'ALWAYS_DISABLED'], ['XR_MSFT_hand_interaction', 'ALWAYS_DISABLED'],
['XR_OPPO_controller_interaction'],
['XR_EXTX_overlay'], ['XR_EXTX_overlay'],
['XR_HTCX_vive_tracker_interaction', 'ALWAYS_DISABLED'], ['XR_HTCX_vive_tracker_interaction', 'ALWAYS_DISABLED'],
['XR_MNDX_ball_on_a_stick_controller'], ['XR_MNDX_ball_on_a_stick_controller'],

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

@ -315,6 +315,17 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
subpath_fn = oxr_verify_ext_hand_interaction_ext_subpath; subpath_fn = oxr_verify_ext_hand_interaction_ext_subpath;
dpad_path_fn = oxr_verify_ext_hand_interaction_ext_dpad_path; dpad_path_fn = oxr_verify_ext_hand_interaction_ext_dpad_path;
dpad_emulator_fn = oxr_verify_ext_hand_interaction_ext_dpad_emulator; dpad_emulator_fn = oxr_verify_ext_hand_interaction_ext_dpad_emulator;
} else if (ip == inst->path_cache.oppo_mr_controller) {
if (!inst->extensions.OPPO_controller_interaction) {
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED,
"(suggestedBindings->interactionProfile == \"%s\") used but "
"XR_OPPO_controller_interaction not enabled",
ip_str);
}
subpath_fn = oxr_verify_oppo_mr_controller_oppo_subpath;
dpad_path_fn = oxr_verify_oppo_mr_controller_oppo_dpad_path;
dpad_emulator_fn = oxr_verify_oppo_mr_controller_oppo_dpad_emulator;
} else { } else {
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED,
"(suggestedBindings->interactionProfile == \"%s\") is not " "(suggestedBindings->interactionProfile == \"%s\") is not "

1
src/xrt/state_trackers/oxr/oxr_binding.c
View file

@ -337,6 +337,7 @@ get_profile_for_device_name(struct oxr_logger *log,
case XRT_DEVICE_ML2_CONTROLLER: FIND_PROFILE(ml_ml2_controller); return; case XRT_DEVICE_ML2_CONTROLLER: FIND_PROFILE(ml_ml2_controller); return;
case XRT_DEVICE_HAND_INTERACTION: FIND_PROFILE(msft_hand_interaction); return; case XRT_DEVICE_HAND_INTERACTION: FIND_PROFILE(msft_hand_interaction); return;
case XRT_DEVICE_EYE_GAZE_INTERACTION: FIND_PROFILE(ext_eye_gaze_interaction); return; case XRT_DEVICE_EYE_GAZE_INTERACTION: FIND_PROFILE(ext_eye_gaze_interaction); return;
case XRT_DEVICE_OPPO_MR_CONTROLLER: FIND_PROFILE(oppo_mr_controller); return;
// no interaction // no interaction
default: default:

12
src/xrt/state_trackers/oxr/oxr_extension_support.h
View file

@ -371,6 +371,17 @@
#endif #endif
/*
* XR_OPPO_controller_interaction
*/
#if defined(XR_OPPO_controller_interaction)
#define OXR_HAVE_OPPO_controller_interaction
#define OXR_EXTENSION_SUPPORT_OPPO_controller_interaction(_) _(OPPO_controller_interaction, OPPO_CONTROLLER_INTERACTION)
#else
#define OXR_EXTENSION_SUPPORT_OPPO_controller_interaction(_)
#endif
/* /*
* XR_EXTX_overlay * XR_EXTX_overlay
*/ */
@ -493,6 +504,7 @@
OXR_EXTENSION_SUPPORT_MND_headless(_) \ OXR_EXTENSION_SUPPORT_MND_headless(_) \
OXR_EXTENSION_SUPPORT_MND_swapchain_usage_input_attachment_bit(_) \ OXR_EXTENSION_SUPPORT_MND_swapchain_usage_input_attachment_bit(_) \
OXR_EXTENSION_SUPPORT_MSFT_hand_interaction(_) \ OXR_EXTENSION_SUPPORT_MSFT_hand_interaction(_) \
OXR_EXTENSION_SUPPORT_OPPO_controller_interaction(_) \
OXR_EXTENSION_SUPPORT_EXTX_overlay(_) \ OXR_EXTENSION_SUPPORT_EXTX_overlay(_) \
OXR_EXTENSION_SUPPORT_HTCX_vive_tracker_interaction(_) \ OXR_EXTENSION_SUPPORT_HTCX_vive_tracker_interaction(_) \
OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \ OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \

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

@ -241,6 +241,7 @@ oxr_instance_create(struct oxr_logger *log,
cache_path(log, inst, "/interaction_profiles/microsoft/hand_interaction", &inst->path_cache.msft_hand_interaction); cache_path(log, inst, "/interaction_profiles/microsoft/hand_interaction", &inst->path_cache.msft_hand_interaction);
cache_path(log, inst, "/interaction_profiles/ext/eye_gaze_interaction", &inst->path_cache.ext_eye_gaze_interaction); cache_path(log, inst, "/interaction_profiles/ext/eye_gaze_interaction", &inst->path_cache.ext_eye_gaze_interaction);
cache_path(log, inst, "/interaction_profiles/ext/hand_interaction_ext", &inst->path_cache.ext_hand_interaction); cache_path(log, inst, "/interaction_profiles/ext/hand_interaction_ext", &inst->path_cache.ext_hand_interaction);
cache_path(log, inst, "/interaction_profiles/oppo/mr_controller_oppo", &inst->path_cache.oppo_mr_controller);
// clang-format on // clang-format on

1
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -1368,6 +1368,7 @@ struct oxr_instance
XrPath msft_hand_interaction; XrPath msft_hand_interaction;
XrPath ext_eye_gaze_interaction; XrPath ext_eye_gaze_interaction;
XrPath ext_hand_interaction; XrPath ext_hand_interaction;
XrPath oppo_mr_controller;
} path_cache; } path_cache;
struct struct