Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
blender
monado-rpavlik
Commits
b7defdb0
Commit
b7defdb0
authored
Jun 30, 2019
by
Jakob Bornecrantz
Browse files
st/oxr: Use new prober function helpers
parent
98553645
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/xrt/state_trackers/oxr/oxr_instance.c
View file @
b7defdb0
...
...
@@ -51,7 +51,6 @@ static XrResult
oxr_instance_destroy
(
struct
oxr_logger
*
log
,
struct
oxr_handle_base
*
hb
)
{
struct
oxr_instance
*
inst
=
(
struct
oxr_instance
*
)
hb
;
struct
xrt_prober
*
prober
=
inst
->
prober
;
oxr_path_destroy_all
(
log
,
inst
);
...
...
@@ -63,9 +62,7 @@ oxr_instance_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
xdev_destroy
(
&
inst
->
system
.
left
);
xdev_destroy
(
&
inst
->
system
.
right
);
if
(
inst
->
prober
!=
NULL
)
{
prober
->
destroy
(
&
inst
->
prober
);
}
xrt_prober_destroy
(
&
inst
->
prober
);
time_state_destroy
(
inst
->
timekeeping
);
inst
->
timekeeping
=
NULL
;
...
...
@@ -112,21 +109,21 @@ oxr_instance_create(struct oxr_logger *log,
p_ret
=
xrt_prober_create
(
&
inst
->
prober
);
if
(
p_ret
!=
0
)
{
inst
->
prober
->
destroy
(
&
inst
->
prober
);
xrt_
prober
_
destroy
(
&
inst
->
prober
);
return
oxr_error
(
log
,
XR_ERROR_RUNTIME_FAILURE
,
"Failed to create prober"
);
}
p_ret
=
inst
->
prober
->
probe
(
inst
->
prober
);
p_ret
=
xrt_
prober
_
probe
(
inst
->
prober
);
if
(
p_ret
!=
0
)
{
inst
->
prober
->
destroy
(
&
inst
->
prober
);
xrt_
prober
_
destroy
(
&
inst
->
prober
);
return
oxr_error
(
log
,
XR_ERROR_RUNTIME_FAILURE
,
"Failed to probe device(s)"
);
}
p_ret
=
inst
->
prober
->
select
(
inst
->
prober
,
xdevs
,
3
);
p_ret
=
xrt_
prober
_
select
(
inst
->
prober
,
xdevs
,
3
);
if
(
p_ret
!=
0
)
{
inst
->
prober
->
destroy
(
&
inst
->
prober
);
xrt_
prober
_
destroy
(
&
inst
->
prober
);
return
oxr_error
(
log
,
XR_ERROR_RUNTIME_FAILURE
,
"Failed to select device"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment