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

st/oxr: Remove unused out_xdev argument

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-02-28 15:13:00 +00:00
parent 78f069a10d
commit a86cb86c80
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// Copyright 2018-2022, Collabora, Ltd. // Copyright 2018-2023, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -882,8 +882,7 @@ XRT_CHECK_RESULT bool
oxr_space_get_pure_relation(struct oxr_logger *log, oxr_space_get_pure_relation(struct oxr_logger *log,
struct oxr_space *spc, struct oxr_space *spc,
XrTime time, XrTime time,
struct xrt_space_relation *out_relation, struct xrt_space_relation *out_relation);
struct xrt_device **out_xdev);
XrResult XrResult
oxr_space_locate( oxr_space_locate(

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

@ -1,4 +1,4 @@
// Copyright 2019-2022, Collabora, Ltd. // Copyright 2019-2023, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -200,8 +200,7 @@ oxr_space_pure_relation_in_space(struct oxr_logger *log,
struct xrt_space_relation *out_relation) struct xrt_space_relation *out_relation)
{ {
struct xrt_space_relation pure_space_relation; struct xrt_space_relation pure_space_relation;
struct xrt_device *xdev; if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation)) {
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation, &xdev)) {
return false; return false;
} }
@ -239,8 +238,7 @@ oxr_space_pure_relation_from_space(struct oxr_logger *log,
struct xrt_space_relation *out_relation) struct xrt_space_relation *out_relation)
{ {
struct xrt_space_relation pure_space_relation; struct xrt_space_relation pure_space_relation;
struct xrt_device *xdev; if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation)) {
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation, &xdev)) {
return false; return false;
} }
@ -268,12 +266,10 @@ XRT_CHECK_RESULT bool
oxr_space_get_pure_relation(struct oxr_logger *log, oxr_space_get_pure_relation(struct oxr_logger *log,
struct oxr_space *spc, struct oxr_space *spc,
XrTime time, XrTime time,
struct xrt_space_relation *out_relation, struct xrt_space_relation *out_relation)
struct xrt_device **out_xdev)
{ {
if (oxr_space_type_is_reference(spc->space_type)) { if (oxr_space_type_is_reference(spc->space_type)) {
struct xrt_device *head_xdev = GET_XDEV_BY_ROLE(spc->sess->sys, head); struct xrt_device *head_xdev = GET_XDEV_BY_ROLE(spc->sess->sys, head);
*out_xdev = head_xdev;
return oxr_space_ref_get_pure_relation(log, spc->sess, spc->space_type, head_xdev, time, out_relation); return oxr_space_ref_get_pure_relation(log, spc->sess, spc->space_type, head_xdev, time, out_relation);
} }
if (spc->space_type == OXR_SPACE_TYPE_ACTION) { if (spc->space_type == OXR_SPACE_TYPE_ACTION) {
@ -286,7 +282,6 @@ oxr_space_get_pure_relation(struct oxr_logger *log,
return false; return false;
} }
*out_xdev = input->xdev;
oxr_xdev_get_space_relation(log, spc->sess->sys->inst, input->xdev, input->input->name, time, oxr_xdev_get_space_relation(log, spc->sess->sys->inst, input->xdev, input->input->name, time,
out_relation); out_relation);
@ -325,14 +320,12 @@ get_pure_space_relation(struct oxr_logger *log,
struct xrt_space_relation *out_relation) struct xrt_space_relation *out_relation)
{ {
struct xrt_space_relation space_pure_relation; struct xrt_space_relation space_pure_relation;
struct xrt_device *space_xdev; if (!oxr_space_get_pure_relation(log, spc, time, &space_pure_relation)) {
if (!oxr_space_get_pure_relation(log, spc, time, &space_pure_relation, &space_xdev)) {
return false; return false;
} }
struct xrt_space_relation base_space_pure_relation; struct xrt_space_relation base_space_pure_relation;
struct xrt_device *base_space_xdev; if (!oxr_space_get_pure_relation(log, baseSpc, time, &base_space_pure_relation)) {
if (!oxr_space_get_pure_relation(log, baseSpc, time, &base_space_pure_relation, &base_space_xdev)) {
return false; return false;
} }