Workarounds for webxr glwindow on macos

servo · May 5, 2020 · 5c3f1c9 · 5c3f1c9
1 parent 2b20f04
commit 5c3f1c9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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,