aboutsummaryrefslogtreecommitdiffstats
path: root/src/platform/windows
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-07-27 10:13:00 +0200
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-07-27 10:13:00 +0200
commitf7cc80fbb1607d9af05476dfe5bbb404c55b1b69 (patch)
tree4b1f32a272cdfe62295bdc4b2a1ad10444458bf9 /src/platform/windows
parentc9b1b91b8cb7e43c0908c04afaefb8e49e0f2b35 (diff)
downloadglutin-f7cc80fbb1607d9af05476dfe5bbb404c55b1b69.tar.gz
glutin-f7cc80fbb1607d9af05476dfe5bbb404c55b1b69.zip
Headless contexts now create an EGL pbuffer on win32
Diffstat (limited to 'src/platform/windows')
-rw-r--r--src/platform/windows/mod.rs54
1 files changed, 46 insertions, 8 deletions
diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs
index c062dfc..cf63784 100644
--- a/src/platform/windows/mod.rs
+++ b/src/platform/windows/mod.rs
@@ -14,6 +14,7 @@ use PixelFormat;
use GlContext;
use api::egl::ffi::egl::Egl;
+use api::egl::Context as EglContext;
use std::ffi::CString;
use std::ops::{Deref, DerefMut};
@@ -75,37 +76,74 @@ impl DerefMut for Window {
}
///
-pub struct HeadlessContext(win32::Window);
+pub enum HeadlessContext {
+ /// A regular window, but invisible.
+ HiddenWindow(win32::Window),
+ /// An EGL pbuffer.
+ EglPbuffer(EglContext),
+}
impl HeadlessContext {
pub fn new(mut builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
builder.visible = false;
- win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)).map(|w| HeadlessContext(w))
+
+ // 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, None)
+ .and_then(|prototype| prototype.finish_pbuffer())
+ .map(|ctxt| HeadlessContext::EglPbuffer(ctxt));
+
+ if let Ok(context) = context {
+ return Ok(context);
+ }
+ }
+
+ let window = try!(win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)));
+ Ok(HeadlessContext::HiddenWindow(window))
}
}
impl GlContext for HeadlessContext {
unsafe fn make_current(&self) -> Result<(), ContextError> {
- self.0.make_current()
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.make_current(),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.make_current(),
+ }
}
fn is_current(&self) -> bool {
- self.0.is_current()
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.is_current(),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.is_current(),
+ }
}
fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
- self.0.get_proc_address(addr)
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.get_proc_address(addr),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.get_proc_address(addr),
+ }
}
fn swap_buffers(&self) -> Result<(), ContextError> {
- self.0.swap_buffers()
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.swap_buffers(),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.swap_buffers(),
+ }
}
fn get_api(&self) -> Api {
- self.0.get_api()
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.get_api(),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.get_api(),
+ }
}
fn get_pixel_format(&self) -> PixelFormat {
- self.0.get_pixel_format()
+ match self {
+ &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.get_pixel_format(),
+ &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.get_pixel_format(),
+ }
}
}