Workarounds for webxr glwindow on macos

This commit is contained in:
Alan Jeffrey 2020-05-04 17:05:50 -05:00
parent 2b20f04e8b
commit 5c3f1c90f4
5 changed files with 8 additions and 4 deletions

4
Cargo.lock generated
View file

@ -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",

View file

@ -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" }

View file

@ -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,
},

View file

@ -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
}
}
}

View file

@ -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,