Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix magic leap build.

Browse source
This commit is contained in:
Josh Matthews 2019-07-04 18:06:34 -04:00
parent f3e237e558
commit 4fe129109b
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ports/libmlservo/src/lib.rs
View file

@ -144,8 +144,8 @@ pub unsafe extern "C" fn init_servo(
VRInitOptions::None VRInitOptions::None
} else { } else {
let name = String::from("Magic Leap VR Display"); let name = String::from("Magic Leap VR Display");
let (service, heartbeat) = let (service, heartbeat) = MagicLeapVRService::new(name, ctxt, gl.gl_wrapper.clone())
MagicLeapVRService::new(name, ctxt, gl.clone()).expect("Failed to create VR service"); .expect("Failed to create VR service");
let service = Box::new(service); let service = Box::new(service);
let heartbeat = Box::new(heartbeat); let heartbeat = Box::new(heartbeat);
VRInitOptions::VRService(service, heartbeat) VRInitOptions::VRService(service, heartbeat)
@ -157,6 +157,8 @@ pub unsafe extern "C" fn init_servo(
enable_subpixel_text_antialiasing: false, enable_subpixel_text_antialiasing: false,
vr_init, vr_init,
coordinates, coordinates,
gl_context_pointer: Some(gl.gl_context),
native_display_pointer: Some(gl.display),
}; };
let wakeup = Box::new(EventLoopWakerInstance); let wakeup = Box::new(EventLoopWakerInstance);
let shut_down_complete = Rc::new(Cell::new(false)); let shut_down_complete = Rc::new(Cell::new(false));
@ -172,7 +174,7 @@ pub unsafe extern "C" fn init_servo(
keyboard, keyboard,
}); });
info!("Starting servo"); info!("Starting servo");
simpleservo::init(opts, gl, wakeup, callbacks).expect("error initializing Servo"); simpleservo::init(opts, gl.gl_wrapper, wakeup, callbacks).expect("error initializing Servo");
let result = Box::new(ServoInstance { let result = Box::new(ServoInstance {
scroll_state: ScrollState::TriggerUp, scroll_state: ScrollState::TriggerUp,