aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/wayland
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-07-19 09:42:56 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-07-19 09:42:56 +0200
commit896640f2e0fd659e952e492c1b74841624db8d08 (patch)
treeadccd7de2cc8374f432b84e921fb986988ad0679 /src/api/wayland
parent7d1d035d9ad5d262a67c6857596caefe957dcfda (diff)
parent4eacfce59e99e4d841255a053ce6acdc77b0c91c (diff)
downloadglutin-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/wayland')
-rw-r--r--src/api/wayland/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs
index 0af5496..826826e 100644
--- a/src/api/wayland/mod.rs
+++ b/src/api/wayland/mod.rs
@@ -169,9 +169,9 @@ impl Window {
try!(EglContext::new(
egl,
&builder,
- Some(wayland_context.display.ptr() as *const _),
- (*shell_surface).ptr() as *const _
- ))
+ Some(wayland_context.display.ptr() as *const _))
+ .and_then(|p| p.finish((*shell_surface).ptr() as *const _))
+ )
};
let events = Arc::new(Mutex::new(VecDeque::new()));