Auto merge of #26458 - Manishearth:secondary-view, r=asajeffrey

Update webxr with secondary view support Blocked on servo/webxr#171 , untested
servo · May 13, 2020 · bdfa6b0 · bdfa6b0
2 parents d96accc + da3d2a8
commit bdfa6b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/script/dom/xrviewerpose.rs b/components/script/dom/xrviewerpose.rs
@@ -57,6 +57,11 @@ impl XRViewerPose {
                 views.push(XRView::new(global, session, &left, XREye::Left, &pose));
                 views.push(XRView::new(global, session, &right, XREye::Right, &pose));
             },
+            Views::StereoCapture(left, right, third_eye) => {
+                views.push(XRView::new(global, session, &left, XREye::Left, &pose));
+                views.push(XRView::new(global, session, &right, XREye::Right, &pose));
+                views.push(XRView::new(global, session, &third_eye, XREye::None, &pose));
+            },
         });
         let transform = XRRigidTransform::new(global, cast_transform(pose));
         let pose = reflect_dom_object(Box::new(XRViewerPose::new_inherited(&transform)), global);

diff --git a/components/script/dom/xrwebgllayer.rs b/components/script/dom/xrwebgllayer.rs
@@ -249,8 +249,11 @@ impl XRWebGLLayerMethods for XRWebGLLayer {
                 Rect::new(origin, self.size().cast())
             },
             (XREye::None, Views::Mono(view)) => view.viewport,
+            (XREye::None, Views::StereoCapture(_, _, view)) => view.viewport,
             (XREye::Left, Views::Stereo(view, _)) => view.viewport,
+            (XREye::Left, Views::StereoCapture(view, _, _)) => view.viewport,
             (XREye::Right, Views::Stereo(_, view)) => view.viewport,
+            (XREye::Right, Views::StereoCapture(_, view, _)) => view.viewport,
             _ => return None,
         };