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

st/oxr: Reset action cache fully when doing bindings

Browse source 
If the devices changes actions where left bound when they shouldn't be.
This commit is contained in:
Jakob Bornecrantz 2023-12-12 12:15:57 +00:00
parent b60585f906
commit 88f83d0992
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,13 @@ oxr_action_bind_io(struct oxr_logger *log,
*/ */
/*! /*!
* De-initialize/de-allocate all dynamic members of @ref oxr_action_cache * De-initialize/de-allocate all dynamic members of @ref oxr_action_cache and
* reset all fields. This function is used when destroying an action that has
* been attached to the session (@ref oxr_action_attachment), or when bindings
* are (re)made for the action. Bindings can be (re)made multiple times during
* the runtime of the session, such as when a device is dynamically moved
* between roles.
*
* @private @memberof oxr_action_cache * @private @memberof oxr_action_cache
*/ */
static void static void
@ -95,10 +101,14 @@ oxr_action_cache_teardown(struct oxr_action_cache *cache)
oxr_input_transform_destroy(&(action_input->transforms)); oxr_input_transform_destroy(&(action_input->transforms));
action_input->transform_count = 0; action_input->transform_count = 0;
} }
free(cache->inputs); free(cache->inputs);
cache->inputs = NULL; cache->inputs = NULL;
free(cache->outputs); free(cache->outputs);
cache->outputs = NULL; cache->outputs = NULL;
U_ZERO(cache);
} }
/*! /*!
@ -1413,10 +1423,23 @@ oxr_action_bind_io(struct oxr_logger *log,
struct oxr_action_output outputs[OXR_MAX_BINDINGS_PER_ACTION] = {0}; struct oxr_action_output outputs[OXR_MAX_BINDINGS_PER_ACTION] = {0};
uint32_t output_count = 0; uint32_t output_count = 0;
get_binding(log, slog, sess, act_ref, profile, subaction_path, inputs, &input_count, outputs, &output_count); // If we are binding again, reset the cache fully.
oxr_action_cache_teardown(cache);
cache->current.active = false; // Fill out the arrays with the bindings we can find.
get_binding( //
log, // log
slog, // slog
sess, // sess
act_ref, // act_ref
profile, // profile
subaction_path, // subaction_path
inputs, // inputs
&input_count, // input_count
outputs, // outputs
&output_count); // output_count
// Mutually exclusive to outputs.
if (input_count > 0) { if (input_count > 0) {
uint32_t count = 0; uint32_t count = 0;
cache->current.active = true; cache->current.active = true;
@ -1469,6 +1492,7 @@ oxr_action_bind_io(struct oxr_logger *log,
cache->input_count = count; cache->input_count = count;
} }
// Mutually exclusive to inputs.
if (output_count > 0) { if (output_count > 0) {
cache->current.active = true; cache->current.active = true;
cache->outputs = U_TYPED_ARRAY_CALLOC(struct oxr_action_output, output_count); cache->outputs = U_TYPED_ARRAY_CALLOC(struct oxr_action_output, output_count);