Update rust-webvr to 0.8

servo · Aug 30, 2017 · 714fe3b · 714fe3b
1 parent 19cbea2
commit 714fe3b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -91,7 +91,6 @@ utf-8 = "0.7"
 uuid = {version = "0.5", features = ["v4"]}
 xml5ever = {version = "0.9"}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
-webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]

diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml
@@ -15,6 +15,7 @@ euclid = "0.15"
 ipc-channel = "0.8"
 log = "0.3"
 msg = {path = "../msg"}
+rust-webvr = {version = "0.8", features = ["openvr"]}
 script_traits = {path = "../script_traits"}
 servo_config = {path = "../config"}
 webvr_traits = {path = "../webvr_traits" }
diff --git a/components/webvr/lib.rs b/components/webvr/lib.rs
@@ -10,6 +10,7 @@ extern crate ipc_channel;
 #[macro_use]
 extern crate log;
 extern crate msg;
+extern crate rust_webvr;
 extern crate script_traits;
 extern crate servo_config;
 extern crate webvr_traits;

diff --git a/components/webvr/webvr_thread.rs b/components/webvr/webvr_thread.rs
@@ -7,6 +7,7 @@ use euclid::Size2D;
 use ipc_channel::ipc;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use msg::constellation_msg::PipelineId;
+use rust_webvr::VRServiceManager;
 use script_traits::ConstellationMsg;
 use servo_config::prefs::PREFS;
 use std::{thread, time};
@@ -358,7 +359,8 @@ impl webgl::WebVRRenderHandler for WebVRCompositorHandler {
                             texture_size: Some((size.width as u32, size.height as u32))
                         };
                         unsafe {
-                            (*compositor.0).submit_frame(&layer);
+                            (*compositor.0).render_layer(&layer);
+                            (*compositor.0).submit_frame();
                         }
                     }
                 }

diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml
@@ -12,5 +12,5 @@ path = "lib.rs"
 [dependencies]
 ipc-channel = "0.8"
 msg = {path = "../msg"}
-rust-webvr = {version = "0.5", features = ["serde-serialization"]}
+rust-webvr-api = {version = "0.8", features = ["serde-serialization"]}
 serde = "1.0"
diff --git a/components/webvr_traits/lib.rs b/components/webvr_traits/lib.rs
@@ -7,7 +7,7 @@
 extern crate ipc_channel;
 extern crate msg;
 #[macro_use] extern crate serde;
-pub extern crate rust_webvr as webvr;
+pub extern crate rust_webvr_api as webvr;
 
 mod webvr_traits;