aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-08-02 14:00:50 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-08-02 14:00:50 +0200
commitbe0440666b948faa92f6e3a81a2a384490ed9d10 (patch)
tree2ab462187b6b651f3bcb081d8610366066079a3a /src/api
parent4ca90e203584057e3b7a0dc84e6ee8bf8b42f7bf (diff)
parent743cc317d7ee6bf197311e7a7cfa8f72f83b58d1 (diff)
downloadglutin-be0440666b948faa92f6e3a81a2a384490ed9d10.tar.gz
glutin-be0440666b948faa92f6e3a81a2a384490ed9d10.zip
Merge pull request #553 from tomaka/egl-default
Use EGL by default with X11
Diffstat (limited to 'src/api')
-rw-r--r--src/api/x11/window.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index 4e6e17e..fc8ed5c 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -334,10 +334,10 @@ impl Window {
let builder_clone = builder.clone();
let context = match builder.gl_version {
GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => {
- 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 {
+ if let Some(ref egl) = display.egl {
Prototype::Egl(try!(EglContext::new(egl.clone(), &builder_clone, 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 {
return Err(CreationError::NotSupported);
}