The open source OpenXR runtime
st/oxr: Remove unused out_xdev argument
+8
-16
+2
-3
src/xrt/state_trackers/oxr/oxr_objects.h
+2
-3
src/xrt/state_trackers/oxr/oxr_objects.h
···
1
-
// Copyright 2018-2022, Collabora, Ltd.
1
+
// Copyright 2018-2023, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
882
882
oxr_space_get_pure_relation(struct oxr_logger *log,
883
883
struct oxr_space *spc,
884
884
XrTime time,
885
-
struct xrt_space_relation *out_relation,
886
-
struct xrt_device **out_xdev);
885
+
struct xrt_space_relation *out_relation);
887
886
888
887
XrResult
889
888
oxr_space_locate(
+6
-13
src/xrt/state_trackers/oxr/oxr_space.c
+6
-13
src/xrt/state_trackers/oxr/oxr_space.c
···
1
-
// Copyright 2019-2022, Collabora, Ltd.
1
+
// Copyright 2019-2023, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
200
200
struct xrt_space_relation *out_relation)
201
201
{
202
202
struct xrt_space_relation pure_space_relation;
203
-
struct xrt_device *xdev;
204
-
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation, &xdev)) {
203
+
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation)) {
205
204
return false;
206
205
}
207
206
···
239
238
struct xrt_space_relation *out_relation)
240
239
{
241
240
struct xrt_space_relation pure_space_relation;
242
-
struct xrt_device *xdev;
243
-
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation, &xdev)) {
241
+
if (!oxr_space_get_pure_relation(log, spc, time, &pure_space_relation)) {
244
242
return false;
245
243
}
246
244
···
268
266
oxr_space_get_pure_relation(struct oxr_logger *log,
269
267
struct oxr_space *spc,
270
268
XrTime time,
271
-
struct xrt_space_relation *out_relation,
272
-
struct xrt_device **out_xdev)
269
+
struct xrt_space_relation *out_relation)
273
270
{
274
271
if (oxr_space_type_is_reference(spc->space_type)) {
275
272
struct xrt_device *head_xdev = GET_XDEV_BY_ROLE(spc->sess->sys, head);
276
-
*out_xdev = head_xdev;
277
273
return oxr_space_ref_get_pure_relation(log, spc->sess, spc->space_type, head_xdev, time, out_relation);
278
274
}
279
275
if (spc->space_type == OXR_SPACE_TYPE_ACTION) {
···
286
282
return false;
287
283
}
288
284
289
-
*out_xdev = input->xdev;
290
285
oxr_xdev_get_space_relation(log, spc->sess->sys->inst, input->xdev, input->input->name, time,
291
286
out_relation);
292
287
···
325
320
struct xrt_space_relation *out_relation)
326
321
{
327
322
struct xrt_space_relation space_pure_relation;
328
-
struct xrt_device *space_xdev;
329
-
if (!oxr_space_get_pure_relation(log, spc, time, &space_pure_relation, &space_xdev)) {
323
+
if (!oxr_space_get_pure_relation(log, spc, time, &space_pure_relation)) {
330
324
return false;
331
325
}
332
326
333
327
struct xrt_space_relation base_space_pure_relation;
334
-
struct xrt_device *base_space_xdev;
335
-
if (!oxr_space_get_pure_relation(log, baseSpc, time, &base_space_pure_relation, &base_space_xdev)) {
328
+
if (!oxr_space_get_pure_relation(log, baseSpc, time, &base_space_pure_relation)) {
336
329
return false;
337
330
}
338
331