diff options
author | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-09-21 13:15:43 +0200 |
---|---|---|
committer | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-09-21 14:03:05 +0200 |
commit | 62bafe2130db5aaf32bd46091581086ae435e4cf (patch) | |
tree | 03056bc49bd5ec0da9e155176a74c2d23a8fc603 /src/platform/linux/api_dispatch.rs | |
parent | a8d3342468cc1f490fddb361d54215d9e889271f (diff) | |
download | glutin-62bafe2130db5aaf32bd46091581086ae435e4cf.tar.gz glutin-62bafe2130db5aaf32bd46091581086ae435e4cf.zip |
Remove BuilderAttribs
Diffstat (limited to 'src/platform/linux/api_dispatch.rs')
-rw-r--r-- | src/platform/linux/api_dispatch.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs index 0fae6a0..46c58bb 100644 --- a/src/platform/linux/api_dispatch.rs +++ b/src/platform/linux/api_dispatch.rs @@ -6,14 +6,16 @@ pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/ use std::collections::VecDeque; use std::sync::Arc; -use BuilderAttribs; use ContextError; use CreationError; use CursorState; use Event; +use GlAttributes; use GlContext; use MouseCursor; use PixelFormat; +use PixelFormatRequirements; +use WindowAttributes; use libc; use api::wayland; @@ -161,28 +163,26 @@ impl<'a> Iterator for WaitEventsIterator<'a> { } impl Window { - pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> { - let window = builder.window; - let pf_reqs = builder.pf_reqs; - let opengl = builder.opengl; - + pub fn new(window: &WindowAttributes, pf_reqs: &PixelFormatRequirements, + opengl: &GlAttributes<&Window>) -> Result<Window, CreationError> + { match *BACKEND { Backend::Wayland => { - let opengl = opengl.map_sharing(|w| match w { + let opengl = opengl.clone().map_sharing(|w| match w { &Window::Wayland(ref w) => w, _ => panic!() // TODO: return an error }); - wayland::Window::new(&window, &pf_reqs, &opengl).map(Window::Wayland) + wayland::Window::new(window, pf_reqs, &opengl).map(Window::Wayland) }, Backend::X(ref connec) => { - let opengl = opengl.map_sharing(|w| match w { + let opengl = opengl.clone().map_sharing(|w| match w { &Window::X(ref w) => w, _ => panic!() // TODO: return an error }); - x11::Window::new(connec, &window, &pf_reqs, &opengl).map(Window::X) + x11::Window::new(connec, window, pf_reqs, &opengl).map(Window::X) }, Backend::Error(ref error) => Err(CreationError::NoBackendAvailable(Box::new(error.clone()))) |