diff --git a/Cargo.lock b/Cargo.lock index b6283c93accd..e284f531c2a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6428,7 +6428,7 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#e1e935abacbef378efd3c5a676dfe63d4e5a6692" +source = "git+https://github.com/servo/webxr#ac9a7b23e72436b09e84be980914adf8abb71c96" dependencies = [ "android_injected_glue", "bindgen", @@ -6451,7 +6451,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#e1e935abacbef378efd3c5a676dfe63d4e5a6692" +source = "git+https://github.com/servo/webxr#ac9a7b23e72436b09e84be980914adf8abb71c96" dependencies = [ "euclid", "ipc-channel", diff --git a/Cargo.toml b/Cargo.toml index 6f37b4f3f7c3..c1d7986da5fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,4 +33,3 @@ winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" } spirv_cross = { git = "https://github.com/servo/spirv_cross", branch = "wgpu-servo" } surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" } surfman = { git = "https://github.com/servo/surfman" } - diff --git a/components/config/prefs.rs b/components/config/prefs.rs index b6f2030ad9c5..e1ec7252481c 100644 --- a/components/config/prefs.rs +++ b/components/config/prefs.rs @@ -300,6 +300,8 @@ mod gen { glwindow: { #[serde(default)] enabled: bool, + #[serde(rename = "dom.webxr.glwindow.left-right")] + left_right: bool, #[serde(rename = "dom.webxr.glwindow.red-cyan")] red_cyan: bool, }, diff --git a/ports/glutin/headed_window.rs b/ports/glutin/headed_window.rs index d15520b21258..a11df13e79dd 100644 --- a/ports/glutin/headed_window.rs +++ b/ports/glutin/headed_window.rs @@ -655,8 +655,10 @@ impl webxr::glwindow::GlWindow for XRWindow { fn get_mode(&self) -> webxr::glwindow::GlWindowMode { if pref!(dom.webxr.glwindow.red_cyan) { webxr::glwindow::GlWindowMode::StereoRedCyan - } else { + } else if pref!(dom.webxr.glwindow.left_right) { webxr::glwindow::GlWindowMode::StereoLeftRight + } else { + webxr::glwindow::GlWindowMode::Blit } } } diff --git a/resources/prefs.json b/resources/prefs.json index 61d24c83f65b..e9005c432531 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -34,6 +34,7 @@ "dom.webvtt.enabled": false, "dom.webxr.enabled": true, "dom.webxr.glwindow.enabled": true, + "dom.webxr.glwindow.left-right": false, "dom.webxr.glwindow.red-cyan": false, "dom.webxr.hands.enabled": false, "dom.webxr.layers.enabled": false,