aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Watson <gw@intuitionlibrary.com>2015-02-04 09:22:34 +1000
committerGlenn Watson <gw@intuitionlibrary.com>2015-02-04 09:22:34 +1000
commite5bf195098bc119340e66e71db7a677fab34f2de (patch)
tree0020c5fc867a1898f6d2dcc15517cced7c949d01
parent728f723753da49261c03e8061b748432f4a00182 (diff)
downloadservo-e5bf195098bc119340e66e71db7a677fab34f2de.tar.gz
servo-e5bf195098bc119340e66e71db7a677fab34f2de.zip
Load android OpenGL pointers (fixes #4824).
-rw-r--r--ports/glutin/window.rs11
1 files changed, 1 insertions, 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) => {