From 587dedaa9e95236f891d9a0e4ec04ee3700236a8 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 7 Aug 2015 16:22:31 +0200 Subject: Correctly handle eglGetDisplay --- src/api/x11/window.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/api/x11') 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); } -- cgit v1.2.3