aboutsummaryrefslogtreecommitdiffstats
path: root/src/platform
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-09-21 14:15:41 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-09-21 14:15:41 +0200
commit6787f1d43493f0f8c2310ac3c3d5cb409d13ec40 (patch)
tree03056bc49bd5ec0da9e155176a74c2d23a8fc603 /src/platform
parentf51ace4c7885fa25c146c24181c4d87f5632de3e (diff)
parent62bafe2130db5aaf32bd46091581086ae435e4cf (diff)
downloadglutin-6787f1d43493f0f8c2310ac3c3d5cb409d13ec40.tar.gz
glutin-6787f1d43493f0f8c2310ac3c3d5cb409d13ec40.zip
Merge pull request #603 from tomaka/gl-attribs
Separate the builder attributes into multiple substates
Diffstat (limited to 'src/platform')
-rw-r--r--src/platform/linux/api_dispatch.rs28
-rw-r--r--src/platform/linux/mod.rs11
-rw-r--r--src/platform/windows/mod.rs26
3 files changed, 49 insertions, 16 deletions
diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs
index f25bda9..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,10 +163,28 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
}
impl Window {
- pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
+ pub fn new(window: &WindowAttributes, pf_reqs: &PixelFormatRequirements,
+ opengl: &GlAttributes<&Window>) -> Result<Window, CreationError>
+ {
match *BACKEND {
- Backend::Wayland => wayland::Window::new(builder).map(Window::Wayland),
- Backend::X(ref connec) => x11::Window::new(connec, builder).map(Window::X),
+ Backend::Wayland => {
+ 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)
+ },
+
+ Backend::X(ref connec) => {
+ 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)
+ },
+
Backend::Error(ref error) => Err(CreationError::NoBackendAvailable(Box::new(error.clone())))
}
}
diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
index 3525ce5..f5d663b 100644
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -1,11 +1,12 @@
#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
use Api;
-use BuilderAttribs;
use ContextError;
use CreationError;
+use GlAttributes;
use GlContext;
use PixelFormat;
+use PixelFormatRequirements;
use libc;
use api::osmesa::{self, OsMesaContext};
@@ -25,8 +26,12 @@ pub type MonitorID = (); // TODO: hack to make things work
pub struct HeadlessContext(OsMesaContext);
impl HeadlessContext {
- pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
- match OsMesaContext::new(builder) {
+ pub fn new(dimensions: (u32, u32), pf_reqs: &PixelFormatRequirements,
+ opengl: &GlAttributes<&HeadlessContext>) -> Result<HeadlessContext, CreationError>
+ {
+ let opengl = opengl.clone().map_sharing(|c| &c.0);
+
+ match OsMesaContext::new(dimensions, pf_reqs, &opengl) {
Ok(c) => return Ok(HeadlessContext(c)),
Err(osmesa::OsMesaCreationError::NotSupported) => (),
Err(osmesa::OsMesaCreationError::CreationError(e)) => return Err(e),
diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs
index 7087a23..af9261f 100644
--- a/src/platform/windows/mod.rs
+++ b/src/platform/windows/mod.rs
@@ -7,11 +7,13 @@ pub use api::win32::{WindowProxy, PollEventsIterator, WaitEventsIterator};
use libc;
use Api;
-use BuilderAttribs;
use ContextError;
use CreationError;
use PixelFormat;
+use PixelFormatRequirements;
+use GlAttributes;
use GlContext;
+use WindowAttributes;
use api::egl::ffi::egl::Egl;
use api::egl;
@@ -57,8 +59,11 @@ pub struct Window(win32::Window);
impl Window {
/// See the docs in the crate root file.
- pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
- win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)).map(|w| Window(w))
+ pub fn new(window: &WindowAttributes, pf_reqs: &PixelFormatRequirements,
+ opengl: &GlAttributes<&Window>) -> Result<Window, CreationError>
+ {
+ win32::Window::new(window, pf_reqs, &opengl.clone().map_sharing(|w| &w.0),
+ EGL.as_ref().map(|w| &w.0)).map(|w| Window(w))
}
}
@@ -85,14 +90,15 @@ pub enum HeadlessContext {
}
impl HeadlessContext {
- pub fn new(mut builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
- builder.visible = false;
-
+ pub fn new(dimensions: (u32, u32), pf_reqs: &PixelFormatRequirements,
+ opengl: &GlAttributes<&HeadlessContext>) -> Result<HeadlessContext, CreationError>
+ {
// if EGL is available, we try using EGL first
// if EGL returns an error, we try the hidden window method
if let &Some(ref egl) = &*EGL {
- let context = EglContext::new(egl.0.clone(), &builder, egl::NativeDisplay::Other(None))
- .and_then(|prototype| prototype.finish_pbuffer())
+ let context = EglContext::new(egl.0.clone(), pf_reqs, &opengl.clone().map_sharing(|_| unimplemented!()), // TODO:
+ egl::NativeDisplay::Other(None))
+ .and_then(|prototype| prototype.finish_pbuffer(dimensions))
.map(|ctxt| HeadlessContext::EglPbuffer(ctxt));
if let Ok(context) = context {
@@ -100,7 +106,9 @@ impl HeadlessContext {
}
}
- let window = try!(win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)));
+ let window = try!(win32::Window::new(&WindowAttributes { visible: false, .. Default::default() },
+ pf_reqs, &opengl.clone().map_sharing(|_| unimplemented!()), //TODO:
+ EGL.as_ref().map(|w| &w.0)));
Ok(HeadlessContext::HiddenWindow(window))
}
}