aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/android
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-08-07 16:49:42 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-08-07 16:49:42 +0200
commit90e62083d686ed9c878beb348e9b54853242eab0 (patch)
tree86e5ba50cdab22fb225aa3b2178d9e04779809ec /src/api/android
parent4ab83a23e5d15ac4372ad24cc88f1c970099efc7 (diff)
parent587dedaa9e95236f891d9a0e4ec04ee3700236a8 (diff)
downloadglutin-90e62083d686ed9c878beb348e9b54853242eab0.tar.gz
glutin-90e62083d686ed9c878beb348e9b54853242eab0.zip
Merge pull request #566 from tomaka/display-egl
Correct EGL display handling
Diffstat (limited to 'src/api/android')
-rw-r--r--src/api/android/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/android/mod.rs b/src/api/android/mod.rs
index 7c09a7b..1b52cc0 100644
--- a/src/api/android/mod.rs
+++ b/src/api/android/mod.rs
@@ -112,7 +112,7 @@ impl Window {
return Err(OsError(format!("Android's native window is null")));
}
- let context = try!(EglContext::new(egl::ffi::egl::Egl, &builder, None)
+ let context = try!(EglContext::new(egl::ffi::egl::Egl, &builder, egl::NativeDisplay::Android)
.and_then(|p| p.finish(native_window as *const _)));
let (tx, rx) = channel();
@@ -255,7 +255,7 @@ pub struct HeadlessContext(EglContext);
impl HeadlessContext {
/// See the docs in the crate root file.
pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
- let context = try!(EglContext::new(egl::ffi::egl::Egl, &builder, None));
+ let context = try!(EglContext::new(egl::ffi::egl::Egl, &builder, egl::NativeDisplay::Android));
let context = try!(context.finish_pbuffer());
Ok(context)
}