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: Use subaction_paths helper function

Browse source
This commit is contained in:
Ryan Pavlik 2022-11-08 16:16:12 -06:00 committed by Rylie Pavlik
parent 771808f589
commit f7e8a6f9f9
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/state_trackers/oxr/oxr_input.c
View file

@ -408,7 +408,7 @@ oxr_action_create(struct oxr_logger *log,
// Any subaction paths allowed for this action are allowed for this
// action set. But, do not accumulate "any" - it just means none were
// specified for this action.
oxr_sub_paths_accumulate_except_any(&(act_set->data->permitted_subaction_paths), &subaction_paths);
oxr_subaction_paths_accumulate_except_any(&(act_set->data->permitted_subaction_paths), &subaction_paths);
snprintf(act_ref->name, sizeof(act_ref->name), "%s", createInfo->actionName);
@ -1794,15 +1794,11 @@ oxr_action_sync_data(struct oxr_logger *log,
return XR_ERROR_PATH_UNSUPPORTED;
}
act_set_attached->requested_subaction_paths.any |= subaction_paths.any;
/* never error when requesting any subactionpath */
bool any_action_with_subactionpath = subaction_paths.any;
#define ACCUMULATE_REQUESTED(X) act_set_attached->requested_subaction_paths.X |= subaction_paths.X;
OXR_FOR_EACH_SUBACTION_PATH(ACCUMULATE_REQUESTED)
#undef ACCUMULATE_REQUESTED
oxr_subaction_paths_accumulate(&(act_set_attached->requested_subaction_paths), &subaction_paths);
/* check if we have at least one action for requested subactionpath */
for (uint32_t k = 0; k < act_set_attached->action_attachment_count; k++) {