diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-07-19 09:42:56 +0200 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-07-19 09:42:56 +0200 |
| commit | 896640f2e0fd659e952e492c1b74841624db8d08 (patch) | |
| tree | adccd7de2cc8374f432b84e921fb986988ad0679 /src/api/x11 | |
| parent | 7d1d035d9ad5d262a67c6857596caefe957dcfda (diff) | |
| parent | 4eacfce59e99e4d841255a053ce6acdc77b0c91c (diff) | |
| download | glutin-896640f2e0fd659e952e492c1b74841624db8d08.tar.gz glutin-896640f2e0fd659e952e492c1b74841624db8d08.zip | |
Merge pull request #523 from tomaka/egl-split
Split creating an EGL context in two parts
Diffstat (limited to 'src/api/x11')
| -rw-r--r-- | src/api/x11/window.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index b13a94a..79118ff 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -552,14 +552,14 @@ impl Window { Context::Glx(try!(GlxContext::new(glx.clone(), builder, display.display, window, fb_config, visual_infos))) } else if let Some(ref egl) = display.egl { - Context::Egl(try!(EglContext::new(egl.clone(), &builder, Some(display.display as *const _), window as *const _))) + Context::Egl(try!(EglContext::new(egl.clone(), &builder, Some(display.display as *const _)).and_then(|p| p.finish(window as *const _)))) } else { return Err(CreationError::NotSupported); } }, GlRequest::Specific(Api::OpenGlEs, _) => { if let Some(ref egl) = display.egl { - Context::Egl(try!(EglContext::new(egl.clone(), &builder, Some(display.display as *const _), window as *const _))) + Context::Egl(try!(EglContext::new(egl.clone(), &builder, Some(display.display as *const _)).and_then(|p| p.finish(window as *const _)))) } else { return Err(CreationError::NotSupported); } |