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

auto merge of #4830 : glennw/servo/android-gl, r=mbrubeck

Browse source
This commit is contained in:
bors-servo 2015-02-03 19:45:49 -07:00
commit a766f1a706
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ports/glutin/window.rs
View file

@ -89,7 +89,7 @@ impl Window {
glutin_window.set_window_resize_callback(Some(Window::nested_window_resize as fn(u32, u32)));
Window::load_gl_functions(&glutin_window);
gl::load_with(|s| glutin_window.get_proc_address(s));
let window = Window {
window: glutin_window,
@ -134,15 +134,6 @@ impl Window {
(2, 0)
}
#[cfg(not(target_os="android"))]
fn load_gl_functions(window: &glutin::Window) {
gl::load_with(|s| window.get_proc_address(s));
}
#[cfg(target_os="android")]
fn load_gl_functions(_: &glutin::Window) {
}
fn handle_window_event(&self, event: glutin::Event) -> bool {
match event {
Event::KeyboardInput(element_state, _scan_code, virtual_key_code) => {