Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass AppInfo to OpenXrDiscovery (#32926)

Browse source 
Signed-off-by: Daniel Adams <msub2official@gmail.com>
This commit is contained in:
Daniel Adams 2024-08-03 09:33:45 -10:00 • committed by GitHub
parent f3fe11c382
commit bb176514c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -7745,7 +7745,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr" name = "webxr"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#790f50587d651fd865736cfd8c70cab0dea5dc7f" source = "git+https://github.com/servo/webxr#355dce2140012ac1535ff6f2cf87b60297556eb4"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"euclid", "euclid",
@ -7762,7 +7762,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr-api" name = "webxr-api"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#790f50587d651fd865736cfd8c70cab0dea5dc7f" source = "git+https://github.com/servo/webxr#355dce2140012ac1535ff6f2cf87b60297556eb4"
dependencies = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",

7
ports/servoshell/desktop/app.rs
View file

@ -20,7 +20,7 @@ use servo::Servo;
use surfman::GLApi; use surfman::GLApi;
use webxr::glwindow::GlWindowDiscovery; use webxr::glwindow::GlWindowDiscovery;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
use webxr::openxr::OpenXrDiscovery; use webxr::openxr::{AppInfo, OpenXrDiscovery};
use winit::event::WindowEvent; use winit::event::WindowEvent;
use winit::event_loop::EventLoopWindowTarget; use winit::event_loop::EventLoopWindowTarget;
use winit::window::WindowId; use winit::window::WindowId;
@ -163,7 +163,10 @@ impl App {
))) )))
} else if pref!(dom.webxr.openxr.enabled) && !opts::get().headless { } else if pref!(dom.webxr.openxr.enabled) && !opts::get().headless {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let openxr = Some(XrDiscovery::OpenXr(OpenXrDiscovery::new(None))); let openxr = {
let app_info = AppInfo::new("Servoshell", 0, "Servo", 0);
Some(XrDiscovery::OpenXr(OpenXrDiscovery::new(None, app_info)))
};
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
let openxr = None; let openxr = None;