aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/x11
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-09-21 10:11:32 +0200
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-09-21 12:03:57 +0200
commit3054e2ee0236672ae88bd124e60ba49aae701695 (patch)
treeb1245915338b996389bb229e54adee6f9dd9124d /src/api/x11
parent3ff08d747c40c2fa744483af8717173c6e97cedd (diff)
downloadglutin-3054e2ee0236672ae88bd124e60ba49aae701695.tar.gz
glutin-3054e2ee0236672ae88bd124e60ba49aae701695.zip
Switch EGL to use only pf_reqs and opengl
Diffstat (limited to 'src/api/x11')
-rw-r--r--src/api/x11/window.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index d39e701..0a9189a 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -349,6 +349,7 @@ impl Window {
Egl(::api::egl::ContextPrototype<'a>),
}
let builder_clone = builder.clone();
+ let builder_clone_opengl = builder_clone.opengl.clone().map_sharing(|_| unimplemented!());
let context = match builder.opengl.version {
GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => {
// GLX should be preferred over EGL, otherwise crashes may occur
@@ -356,14 +357,14 @@ impl Window {
if let Some(ref glx) = display.glx {
Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, &builder_clone, display.display)))
} else if let Some(ref egl) = display.egl {
- Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, egl::NativeDisplay::X11(Some(display.display as *const _)))))
+ Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone.pf_reqs, &builder_clone_opengl, egl::NativeDisplay::X11(Some(display.display as *const _)))))
} else {
return Err(CreationError::NotSupported);
}
},
GlRequest::Specific(Api::OpenGlEs, _) => {
if let Some(ref egl) = display.egl {
- Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, egl::NativeDisplay::X11(Some(display.display as *const _)))))
+ Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone.pf_reqs, &builder_clone_opengl, egl::NativeDisplay::X11(Some(display.display as *const _)))))
} else {
return Err(CreationError::NotSupported);
}