Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load android OpenGL pointers (fixes #4824). #4830

Merged
merged 1 commit into from Feb 4, 2015
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -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) => {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.