diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-08-07 16:49:42 +0200 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-08-07 16:49:42 +0200 |
| commit | 90e62083d686ed9c878beb348e9b54853242eab0 (patch) | |
| tree | 86e5ba50cdab22fb225aa3b2178d9e04779809ec /src/api/x11 | |
| parent | 4ab83a23e5d15ac4372ad24cc88f1c970099efc7 (diff) | |
| parent | 587dedaa9e95236f891d9a0e4ec04ee3700236a8 (diff) | |
| download | glutin-90e62083d686ed9c878beb348e9b54853242eab0.tar.gz glutin-90e62083d686ed9c878beb348e9b54853242eab0.zip | |
Merge pull request #566 from tomaka/display-egl
Correct EGL display handling
Diffstat (limited to 'src/api/x11')
| -rw-r--r-- | src/api/x11/window.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index fc8ed5c..a395242 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -17,6 +17,7 @@ use GlRequest; use PixelFormat; use api::glx::Context as GlxContext; +use api::egl; use api::egl::Context as EglContext; use platform::MonitorID as PlatformMonitorID; @@ -335,7 +336,7 @@ impl Window { let context = match builder.gl_version { GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => { if let Some(ref egl) = display.egl { - Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, Some(display.display as *const _)))) + Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, egl::NativeDisplay::X11(Some(display.display as *const _))))) } else if let Some(ref glx) = display.glx { Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, &builder_clone, display.display))) } else { @@ -344,7 +345,7 @@ impl Window { }, GlRequest::Specific(Api::OpenGlEs, _) => { if let Some(ref egl) = display.egl { - Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, Some(display.display as *const _)))) + Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, egl::NativeDisplay::X11(Some(display.display as *const _))))) } else { return Err(CreationError::NotSupported); } |