The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

st/oxr: rename oxr_binding::keys to act_keys

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2431>

authored by

Christoph Haag and committed by
Marge Bot
155488d2 7d368a6e

+45 -44
+28 -27
src/xrt/state_trackers/oxr/oxr_binding.c
··· 195 195 static void 196 196 reset_binding_keys(struct oxr_binding *binding) 197 197 { 198 - free(binding->keys); 198 + free(binding->act_keys); 199 199 free(binding->preferred_binding_path_index); 200 - binding->keys = NULL; 200 + binding->act_keys = NULL; 201 201 binding->preferred_binding_path_index = NULL; 202 - binding->key_count = 0; 202 + binding->act_key_count = 0; 203 203 } 204 204 205 205 static void ··· 211 211 } 212 212 213 213 static void 214 - add_key_to_matching_bindings(struct oxr_binding *bindings, size_t binding_count, XrPath path, uint32_t key) 214 + add_act_key_to_matching_bindings(struct oxr_binding *bindings, size_t binding_count, XrPath path, uint32_t act_key) 215 215 { 216 216 for (size_t x = 0; x < binding_count; x++) { 217 217 struct oxr_binding *b = &bindings[x]; ··· 230 230 continue; 231 231 } 232 232 233 - U_ARRAY_REALLOC_OR_FREE(b->keys, uint32_t, (b->key_count + 1)); 234 - U_ARRAY_REALLOC_OR_FREE(b->preferred_binding_path_index, uint32_t, (b->key_count + 1)); 235 - b->preferred_binding_path_index[b->key_count] = preferred_path_index; 236 - b->keys[b->key_count++] = key; 233 + U_ARRAY_REALLOC_OR_FREE(b->act_keys, uint32_t, (b->act_key_count + 1)); 234 + U_ARRAY_REALLOC_OR_FREE(b->preferred_binding_path_index, uint32_t, (b->act_key_count + 1)); 235 + b->preferred_binding_path_index[b->act_key_count] = preferred_path_index; 236 + b->act_keys[b->act_key_count++] = act_key; 237 237 } 238 238 } 239 239 ··· 397 397 } 398 398 399 399 void 400 - oxr_binding_find_bindings_from_key(struct oxr_logger *log, 401 - struct oxr_interaction_profile *profile, 402 - uint32_t key, 403 - size_t max_binding_count, 404 - struct oxr_binding **out_bindings, 405 - size_t *out_binding_count) 400 + oxr_binding_find_bindings_from_act_key(struct oxr_logger *log, 401 + struct oxr_interaction_profile *profile, 402 + uint32_t key, 403 + size_t max_binding_count, 404 + struct oxr_binding **out_bindings, 405 + size_t *out_binding_count) 406 406 { 407 407 if (profile == NULL) { 408 408 *out_binding_count = 0; ··· 419 419 for (size_t binding_index = 0; binding_index < profile->binding_count; binding_index++) { 420 420 struct oxr_binding *profile_binding = &profile->bindings[binding_index]; 421 421 422 - for (size_t key_index = 0; key_index < profile_binding->key_count; key_index++) { 423 - if (profile_binding->keys[key_index] == key) { 422 + for (size_t key_index = 0; key_index < profile_binding->act_key_count; key_index++) { 423 + if (profile_binding->act_keys[key_index] == key) { 424 424 out_bindings[binding_count++] = profile_binding; 425 425 break; 426 426 } ··· 470 470 sizeof(XrPath) * src_binding->path_count); 471 471 } 472 472 473 - dst_binding->key_count = 0; 474 - dst_binding->keys = NULL; 473 + dst_binding->act_key_count = 0; 474 + dst_binding->act_keys = NULL; 475 475 dst_binding->preferred_binding_path_index = NULL; 476 - if (src_binding->keys && src_binding->key_count > 0) { 477 - dst_binding->key_count = src_binding->key_count; 478 - dst_binding->keys = U_TYPED_ARRAY_CALLOC(uint32_t, src_binding->key_count); 479 - memcpy(dst_binding->keys, src_binding->keys, sizeof(uint32_t) * src_binding->key_count); 476 + if (src_binding->act_keys && src_binding->act_key_count > 0) { 477 + dst_binding->act_key_count = src_binding->act_key_count; 478 + dst_binding->act_keys = U_TYPED_ARRAY_CALLOC(uint32_t, src_binding->act_key_count); 479 + memcpy(dst_binding->act_keys, src_binding->act_keys, 480 + sizeof(uint32_t) * src_binding->act_key_count); 480 481 } 481 - if (src_binding->preferred_binding_path_index && src_binding->key_count > 0) { 482 - assert(dst_binding->key_count == src_binding->key_count); 482 + if (src_binding->preferred_binding_path_index && src_binding->act_key_count > 0) { 483 + assert(dst_binding->act_key_count == src_binding->act_key_count); 483 484 dst_binding->preferred_binding_path_index = 484 - U_TYPED_ARRAY_CALLOC(uint32_t, src_binding->key_count); 485 + U_TYPED_ARRAY_CALLOC(uint32_t, src_binding->act_key_count); 485 486 memcpy(dst_binding->preferred_binding_path_index, 486 487 src_binding->preferred_binding_path_index, 487 - sizeof(uint32_t) * src_binding->key_count); 488 + sizeof(uint32_t) * src_binding->act_key_count); 488 489 } 489 490 } 490 491 } ··· 611 612 const XrActionSuggestedBinding *s = &suggestedBindings->suggestedBindings[i]; 612 613 struct oxr_action *act = XRT_CAST_OXR_HANDLE_TO_PTR(struct oxr_action *, s->action); 613 614 614 - add_key_to_matching_bindings(bindings, binding_count, s->binding, act->act_key); 615 + add_act_key_to_matching_bindings(bindings, binding_count, s->binding, act->act_key); 615 616 } 616 617 617 618 out:
+9 -9
src/xrt/state_trackers/oxr/oxr_input.c
··· 650 650 get_matched_xrpath(struct oxr_binding *b, const struct oxr_action_ref *act) 651 651 { 652 652 XrPath preferred_path = XR_NULL_PATH; 653 - for (uint32_t i = 0; i < b->key_count; i++) { 654 - if (b->keys[i] == act->act_key) { 653 + for (uint32_t i = 0; i < b->act_key_count; i++) { 654 + if (b->act_keys[i] == act->act_key) { 655 655 uint32_t preferred_path_index = XR_NULL_PATH; 656 656 preferred_path_index = b->preferred_binding_path_index[i]; 657 657 preferred_path = b->paths[preferred_path_index]; ··· 730 730 } 731 731 732 732 size_t binding_count = 0; 733 - oxr_binding_find_bindings_from_key( // 734 - log, // log 735 - profile, // p 736 - act_ref->act_key, // key 737 - ARRAY_SIZE(binding_points), // max_binding_count 738 - binding_points, // out_bindings 739 - &binding_count); // out_binding_count 733 + oxr_binding_find_bindings_from_act_key( // 734 + log, // log 735 + profile, // p 736 + act_ref->act_key, // key 737 + ARRAY_SIZE(binding_points), // max_binding_count 738 + binding_points, // out_bindings 739 + &binding_count); // out_binding_count 740 740 if (binding_count == 0) { 741 741 oxr_slog(slog, "\t\t\tNo bindings!\n"); 742 742 return;
+8 -8
src/xrt/state_trackers/oxr/oxr_objects.h
··· 681 681 * @public @memberof oxr_interaction_profile 682 682 */ 683 683 void 684 - oxr_binding_find_bindings_from_key(struct oxr_logger *log, 685 - struct oxr_interaction_profile *profile, 686 - uint32_t key, 687 - size_t max_binding_count, 688 - struct oxr_binding **out_bindings, 689 - size_t *out_binding_count); 684 + oxr_binding_find_bindings_from_act_key(struct oxr_logger *log, 685 + struct oxr_interaction_profile *profile, 686 + uint32_t key, 687 + size_t max_binding_count, 688 + struct oxr_binding **out_bindings, 689 + size_t *out_binding_count); 690 690 691 691 /*! 692 692 * @public @memberof oxr_instance ··· 2046 2046 2047 2047 enum oxr_subaction_path subaction_path; 2048 2048 2049 - uint32_t key_count; 2050 - uint32_t *keys; 2049 + uint32_t act_key_count; 2050 + uint32_t *act_keys; 2051 2051 //! store which entry in paths was suggested, for each action key 2052 2052 uint32_t *preferred_binding_path_index; 2053 2053