From e5bf195098bc119340e66e71db7a677fab34f2de Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 4 Feb 2015 09:22:34 +1000 Subject: [PATCH] Load android OpenGL pointers (fixes #4824). --- ports/glutin/window.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index c7707108b48..3afb152fcef 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -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) => {