diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-02-19 21:55:15 +0100 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-02-19 21:55:15 +0100 |
| commit | 8e1d0f7a976078ef7031ff84e077f00655d4e061 (patch) | |
| tree | e03c5d40096b2545fe02fed2ec4668a3872cc3cd /src/android/mod.rs | |
| parent | 95d70ce549f776794a89c6c83d1df707b914ab8f (diff) | |
| parent | f4f84c6566d99c297cddee3c712e94927f313204 (diff) | |
| download | glutin-8e1d0f7a976078ef7031ff84e077f00655d4e061.tar.gz glutin-8e1d0f7a976078ef7031ff84e077f00655d4e061.zip | |
Merge pull request #282 from tomaka/gl-api
Improve the OpenGL context request system
Diffstat (limited to 'src/android/mod.rs')
| -rw-r--r-- | src/android/mod.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs index ea93040..72ebda3 100644 --- a/src/android/mod.rs +++ b/src/android/mod.rs @@ -11,7 +11,9 @@ use events::MouseButton; use std::collections::RingBuf; +use Api; use BuilderAttribs; +use GlRequest; pub struct Window { display: ffi::egl::types::EGLDisplay, @@ -157,7 +159,10 @@ impl Window { android_glue::write_log("eglInitialize succeeded"); let use_gles2 = match builder.gl_version { - Some((2, 0)) => true, + GlRequest::Specific(Api::OpenGlEs, (2, _)) => true, + GlRequest::Specific(Api::OpenGlEs, _) => false, + GlRequest::Specific(_, _) => panic!("Only OpenGL ES is supported"), // FIXME: return a result + GlRequest::GlThenGles { opengles_version: (2, _), .. } => true, _ => false, }; |