Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use async VR presentation code for XRSession

Browse source
This commit is contained in:
Manish Goregaokar 2019-01-07 17:59:06 -08:00
parent 9ddbf68cb3
commit e2522d36ff
3 changed files with 37 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

62
components/script/dom/vrdisplay.rs
View file

@ -347,8 +347,9 @@ impl VRDisplayMethods for VRDisplay {
},
};
self.request_present(layer_bounds, Some(&layer_ctx),
promise.clone(), |p| p.resolve_native(&()));
self.request_present(layer_bounds, Some(&layer_ctx), Some(promise.clone()), |p| {
p.resolve_native(&())
});
promise
}
@ -437,15 +438,20 @@ impl VRDisplay {
}
}
pub fn request_present<F>(&self, layer_bounds: WebVRLayer,
ctx: Option<&WebGLRenderingContext>,
promise: Rc<Promise>, resolve: F)
where F: FnOnce(Rc<Promise>) + Send + 'static {
pub fn request_present<F>(
&self,
layer_bounds: WebVRLayer,
ctx: Option<&WebGLRenderingContext>,
promise: Option<Rc<Promise>>,
resolve: F,
) where
F: FnOnce(Rc<Promise>) + Send + 'static,
{
// WebVR spec: Repeat calls while already presenting will update the VRLayers being displayed.
if self.presenting.get() {
*self.layer.borrow_mut() = layer_bounds;
self.layer_ctx.set(ctx);
resolve(promise);
promise.map(resolve);
return;
}
@ -458,7 +464,7 @@ impl VRDisplay {
sender,
))
.unwrap();
let promise = TrustedPromise::new(promise);
let promise = promise.map(TrustedPromise::new);
let this = Trusted::new(self);
let ctx = ctx.map(|c| Trusted::new(c));
let global = self.global();
@ -471,23 +477,22 @@ impl VRDisplay {
let _ = task_source.queue_with_canceller(
task!(vr_presenting: move || {
let this = this.root();
let promise = promise.root();
let promise = promise.map(|p| p.root());
let ctx = ctx.map(|c| c.root());
match recv {
Ok(()) => {
*this.layer.borrow_mut() = layer_bounds;
this.layer_ctx.set(ctx.as_ref().map(|c| &**c));
this.init_present();
resolve(promise);
promise.map(resolve);
},
Err(e) => {
promise.reject_native(&e);
promise.map(|p| p.reject_native(&e));
},
}
}),
&canceller,
);
});
}
@ -715,30 +720,19 @@ impl VRDisplay {
// XR stuff
// XXXManishearth eventually we should share as much logic as possible
impl VRDisplay {
pub fn xr_present(&self, session: &XRSession, ctx: Option<&WebGLRenderingContext>) {
pub fn xr_present(
&self,
session: &XRSession,
ctx: Option<&WebGLRenderingContext>,
promise: Option<Rc<Promise>>,
) {
let layer_bounds = WebVRLayer::default();
self.xr_session.set(Some(session));
if self.presenting.get() {
*self.layer.borrow_mut() = layer_bounds;
self.layer_ctx.set(ctx);
return;
}
// Request Present
let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap();
self.webvr_thread()
.send(WebVRMsg::RequestPresent(
self.global().pipeline_id(),
self.display.borrow().display_id,
sender,
))
.unwrap();
if let Ok(()) = receiver.recv().unwrap() {
*self.layer.borrow_mut() = layer_bounds;
self.layer_ctx.set(ctx);
self.init_present();
}
let session = Trusted::new(session);
self.request_present(layer_bounds, ctx, promise, move |p| {
let session = session.root();
p.resolve_native(&session);
});
}
pub fn xr_raf(&self, callback: Rc<XRFrameRequestCallback>) -> u32 {