mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 21:28:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Properly check all extension interaction profiles

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-11-13 22:52:14 +00:00
parent f56b1a42c7
commit d71082b5e1
1 changed files with 60 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,6 +230,24 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
path_verify_fn_t dpad_emulator_fn = NULL; path_verify_fn_t dpad_emulator_fn = NULL;
bool has_dpad = inst->extensions.EXT_dpad_binding; bool has_dpad = inst->extensions.EXT_dpad_binding;
#define EXT_NOT_SUPPORTED(EXT) \
do { \
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, \
"(suggestedBindings->interactionProfile == \"%s\") used but XR_" #EXT \
" not supported by runtime", \
ip_str); \
} while (false)
#define EXT_CHK_ENABLED(EXT) \
do { \
if (!inst->extensions.EXT) { \
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, \
"(suggestedBindings->interactionProfile == \"%s\") used but XR_" #EXT \
" not enabled", \
ip_str); \
} \
} while (false)
if (ip == inst->path_cache.khr_simple_controller) { if (ip == inst->path_cache.khr_simple_controller) {
subpath_fn = oxr_verify_khr_simple_controller_subpath; subpath_fn = oxr_verify_khr_simple_controller_subpath;
dpad_path_fn = oxr_verify_khr_simple_controller_dpad_path; dpad_path_fn = oxr_verify_khr_simple_controller_dpad_path;
@ -267,74 +285,80 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
dpad_path_fn = oxr_verify_valve_index_controller_dpad_path; dpad_path_fn = oxr_verify_valve_index_controller_dpad_path;
dpad_emulator_fn = oxr_verify_valve_index_controller_dpad_emulator; dpad_emulator_fn = oxr_verify_valve_index_controller_dpad_emulator;
} else if (ip == inst->path_cache.hp_mixed_reality_controller) { } else if (ip == inst->path_cache.hp_mixed_reality_controller) {
if (!inst->extensions.EXT_hp_mixed_reality_controller) { #ifdef OXR_HAVE_EXT_hp_mixed_reality_controller
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(EXT_hp_mixed_reality_controller);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"XR_EXT_hp_mixed_reality_controller not enabled", EXT_NOT_SUPPORTED(EXT_hp_mixed_reality_controller);
ip_str); #endif
}
subpath_fn = oxr_verify_hp_mixed_reality_controller_subpath; subpath_fn = oxr_verify_hp_mixed_reality_controller_subpath;
dpad_path_fn = oxr_verify_hp_mixed_reality_controller_dpad_path; dpad_path_fn = oxr_verify_hp_mixed_reality_controller_dpad_path;
dpad_emulator_fn = oxr_verify_hp_mixed_reality_controller_dpad_emulator; dpad_emulator_fn = oxr_verify_hp_mixed_reality_controller_dpad_emulator;
} else if (ip == inst->path_cache.samsung_odyssey_controller) { } else if (ip == inst->path_cache.samsung_odyssey_controller) {
if (!inst->extensions.EXT_samsung_odyssey_controller) { #ifdef OXR_HAVE_EXT_samsung_odyssey_controller
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(EXT_samsung_odyssey_controller);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"XR_EXT_samsung_odyssey_controller not enabled", EXT_NOT_SUPPORTED(EXT_samsung_odyssey_controller);
ip_str); #endif
}
subpath_fn = oxr_verify_samsung_odyssey_controller_subpath; subpath_fn = oxr_verify_samsung_odyssey_controller_subpath;
dpad_path_fn = oxr_verify_samsung_odyssey_controller_dpad_path; dpad_path_fn = oxr_verify_samsung_odyssey_controller_dpad_path;
dpad_emulator_fn = oxr_verify_samsung_odyssey_controller_dpad_emulator; dpad_emulator_fn = oxr_verify_samsung_odyssey_controller_dpad_emulator;
} else if (ip == inst->path_cache.ml_ml2_controller) { } else if (ip == inst->path_cache.ml_ml2_controller) {
if (!inst->extensions.ML_ml2_controller_interaction) { #ifdef OXR_HAVE_ML_ml2_controller_interaction
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(ML_ml2_controller_interaction);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"XR_ML_ml2_controller not enabled", EXT_NOT_SUPPORTED(EL_ml2_controller_interaction);
ip_str); #endif
}
subpath_fn = oxr_verify_ml_ml2_controller_subpath; subpath_fn = oxr_verify_ml_ml2_controller_subpath;
dpad_path_fn = oxr_verify_ml_ml2_controller_dpad_path; dpad_path_fn = oxr_verify_ml_ml2_controller_dpad_path;
dpad_emulator_fn = oxr_verify_ml_ml2_controller_dpad_emulator; dpad_emulator_fn = oxr_verify_ml_ml2_controller_dpad_emulator;
} else if (ip == inst->path_cache.mndx_ball_on_a_stick_controller) { } else if (ip == inst->path_cache.mndx_ball_on_a_stick_controller) {
#ifdef OXR_HAVE_MNDX_ball_on_a_stick_controller
EXT_CHK_ENABLED(MNDX_ball_on_a_stick_controller);
#else
EXT_NOT_SUPPORTED(MNDX_ball_on_a_stick_controller);
#endif
subpath_fn = oxr_verify_mndx_ball_on_a_stick_controller_subpath; subpath_fn = oxr_verify_mndx_ball_on_a_stick_controller_subpath;
dpad_path_fn = oxr_verify_mndx_ball_on_a_stick_controller_dpad_path; dpad_path_fn = oxr_verify_mndx_ball_on_a_stick_controller_dpad_path;
dpad_emulator_fn = oxr_verify_mndx_ball_on_a_stick_controller_dpad_emulator; dpad_emulator_fn = oxr_verify_mndx_ball_on_a_stick_controller_dpad_emulator;
} else if (ip == inst->path_cache.msft_hand_interaction) { } else if (ip == inst->path_cache.msft_hand_interaction) {
#ifdef OXR_HAVE_MSFT_hand_interaction
EXT_CHK_ENABLED(MSFT_hand_interaction);
#else
EXT_NOT_SUPPORTED(MSFT_hand_interaction);
#endif
subpath_fn = oxr_verify_microsoft_hand_interaction_subpath; subpath_fn = oxr_verify_microsoft_hand_interaction_subpath;
dpad_path_fn = oxr_verify_microsoft_hand_interaction_dpad_path; dpad_path_fn = oxr_verify_microsoft_hand_interaction_dpad_path;
dpad_emulator_fn = oxr_verify_microsoft_hand_interaction_dpad_emulator; dpad_emulator_fn = oxr_verify_microsoft_hand_interaction_dpad_emulator;
} else if (ip == inst->path_cache.ext_eye_gaze_interaction) { } else if (ip == inst->path_cache.ext_eye_gaze_interaction) {
if (!inst->extensions.EXT_eye_gaze_interaction) { #ifdef OXR_HAVE_EXT_eye_gaze_interaction
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(EXT_eye_gaze_interaction);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"EXT_eye_gaze_interaction not enabled", EXT_NOT_SUPPORTED(EXT_eye_gaze_interaction);
ip_str); #endif
}
subpath_fn = oxr_verify_ext_eye_gaze_interaction_subpath; subpath_fn = oxr_verify_ext_eye_gaze_interaction_subpath;
dpad_path_fn = oxr_verify_ext_eye_gaze_interaction_dpad_path; dpad_path_fn = oxr_verify_ext_eye_gaze_interaction_dpad_path;
dpad_emulator_fn = oxr_verify_ext_eye_gaze_interaction_dpad_emulator; dpad_emulator_fn = oxr_verify_ext_eye_gaze_interaction_dpad_emulator;
} else if (ip == inst->path_cache.ext_hand_interaction) { } else if (ip == inst->path_cache.ext_hand_interaction) {
if (!inst->extensions.EXT_hand_interaction) { #ifdef OXR_HAVE_EXT_hand_interaction
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(EXT_hand_interaction);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"XR_EXT_hand_interaction not enabled", EXT_NOT_SUPPORTED(EXT_hand_interaction);
ip_str); #endif
}
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) { } else if (ip == inst->path_cache.oppo_mr_controller) {
if (!inst->extensions.OPPO_controller_interaction) { #ifdef OXR_HAVE_OPPO_controller_interaction
return oxr_error(&log, XR_ERROR_PATH_UNSUPPORTED, EXT_CHK_ENABLED(OPPO_controller_interaction);
"(suggestedBindings->interactionProfile == \"%s\") used but " #else
"XR_OPPO_controller_interaction not enabled", EXT_NOT_SUPPORTED(EPPO_controller_interaction);
ip_str); #endif
}
subpath_fn = oxr_verify_oppo_mr_controller_oppo_subpath; subpath_fn = oxr_verify_oppo_mr_controller_oppo_subpath;
dpad_path_fn = oxr_verify_oppo_mr_controller_oppo_dpad_path; dpad_path_fn = oxr_verify_oppo_mr_controller_oppo_dpad_path;