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

st/oxr: Fix inconsistent naming related to subaction paths

Browse source
This commit is contained in:
Ryan Pavlik 2022-11-08 16:33:52 -06:00
parent b2e65ed08c
commit 999c67975a
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,7 +330,7 @@ oxr_action_create(struct oxr_logger *log,
// Mod music for all! // Mod music for all!
static uint32_t key_gen = 1; static uint32_t key_gen = 1;
if (!oxr_classify_sub_action_paths(log, inst, createInfo->countSubactionPaths, createInfo->subactionPaths, if (!oxr_classify_subaction_paths(log, inst, createInfo->countSubactionPaths, createInfo->subactionPaths,
&subaction_paths)) { &subaction_paths)) {
return XR_ERROR_PATH_UNSUPPORTED; return XR_ERROR_PATH_UNSUPPORTED;
} }
@ -370,7 +370,7 @@ oxr_action_create(struct oxr_logger *log,
*/ */
bool bool
oxr_classify_sub_action_paths(struct oxr_logger *log, oxr_classify_subaction_paths(struct oxr_logger *log,
const struct oxr_instance *inst, const struct oxr_instance *inst,
uint32_t subaction_path_count, uint32_t subaction_path_count,
const XrPath *subaction_paths, const XrPath *subaction_paths,
@ -1591,7 +1591,7 @@ oxr_action_sync_data(struct oxr_logger *log,
oxr_session_get_action_set_attachment(sess, actionSets[i].actionSet, &act_set_attached, &act_set); oxr_session_get_action_set_attachment(sess, actionSets[i].actionSet, &act_set_attached, &act_set);
assert(act_set_attached != NULL); assert(act_set_attached != NULL);
if (!oxr_classify_sub_action_paths(log, sess->sys->inst, 1, &actionSets[i].subactionPath, if (!oxr_classify_subaction_paths(log, sess->sys->inst, 1, &actionSets[i].subactionPath,
&subaction_paths)) { &subaction_paths)) {
return XR_ERROR_PATH_UNSUPPORTED; return XR_ERROR_PATH_UNSUPPORTED;
} }

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

@ -456,15 +456,15 @@ oxr_action_to_openxr(struct oxr_action *act)
* Sets all members of @p subaction_paths ( @ref oxr_subaction_paths ) as * Sets all members of @p subaction_paths ( @ref oxr_subaction_paths ) as
* appropriate based on the subaction paths found in the list. * appropriate based on the subaction paths found in the list.
* *
* If no paths are provided, @p sub_paths->any will be true. * If no paths are provided, @p subaction_paths->any will be true.
* *
* @return false if an invalid subaction path is provided. * @return false if an invalid subaction path is provided.
* *
* @public @memberof oxr_instance * @public @memberof oxr_instance
* @see oxr_sub_paths * @see oxr_subaction_paths
*/ */
bool bool
oxr_classify_sub_action_paths(struct oxr_logger *log, oxr_classify_subaction_paths(struct oxr_logger *log,
const struct oxr_instance *inst, const struct oxr_instance *inst,
uint32_t subaction_path_count, uint32_t subaction_path_count,
const XrPath *subaction_paths, const XrPath *subaction_paths,

2
src/xrt/state_trackers/oxr/oxr_space.c
View file

@ -68,7 +68,7 @@ oxr_space_action_create(struct oxr_logger *log,
struct oxr_space *spc = NULL; struct oxr_space *spc = NULL;
OXR_ALLOCATE_HANDLE_OR_RETURN(log, spc, OXR_XR_DEBUG_SPACE, oxr_space_destroy, &sess->handle); OXR_ALLOCATE_HANDLE_OR_RETURN(log, spc, OXR_XR_DEBUG_SPACE, oxr_space_destroy, &sess->handle);
oxr_classify_sub_action_paths(log, inst, 1, &createInfo->subactionPath, &subaction_paths); oxr_classify_subaction_paths(log, inst, 1, &createInfo->subactionPath, &subaction_paths);
spc->sess = sess; spc->sess = sess;
spc->space_type = OXR_SPACE_TYPE_ACTION; spc->space_type = OXR_SPACE_TYPE_ACTION;