4 files changed, 147 insertions, 6 deletions
diff --git a/src/platform/android/mod.rs b/src/platform/android/mod.rs
index c90d8ce..a1b9416 100644
--- a/src/platform/android/mod.rs
+++ b/src/platform/android/mod.rs
@@ -1,3 +1,34 @@
 #![cfg(target_os = "android")]
 
 pub use api::android::*;
+
+pub struct HeadlessContext(i32);
+
+impl HeadlessContext {
+    /// See the docs in the crate root file.
+    pub fn new(_builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
+        unimplemented!()
+    }
+
+    /// See the docs in the crate root file.
+    pub unsafe fn make_current(&self) {
+        unimplemented!()
+    }
+
+    /// See the docs in the crate root file.
+    pub fn is_current(&self) -> bool {
+        unimplemented!()
+    }
+
+    /// See the docs in the crate root file.
+    pub fn get_proc_address(&self, _addr: &str) -> *const () {
+        unimplemented!()
+    }
+
+    pub fn get_api(&self) -> ::Api {
+        ::Api::OpenGlEs
+    }
+}
+
+unsafe impl Send for HeadlessContext {}
+unsafe impl Sync for HeadlessContext {}
diff --git a/src/platform/emscripten/mod.rs b/src/platform/emscripten/mod.rs
new file mode 100644
index 0000000..56a7e9f
--- /dev/null
+++ b/src/platform/emscripten/mod.rs
@@ -0,0 +1,44 @@
+#![cfg(target_os = "emscripten")]
+
+use GlContext;
+
+pub use api::emscripten::{Window, WindowProxy, MonitorID, get_available_monitors};
+pub use api::emscripten::{get_primary_monitor, WaitEventsIterator, PollEventsIterator};
+
+pub struct HeadlessContext(Window);
+
+impl HeadlessContext {
+    /// See the docs in the crate root file.
+    pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
+        Window::new(builder).map(|w| HeadlessContext(w))
+    }
+}
+
+impl GlContext for HeadlessContext {
+    unsafe fn make_current(&self) {
+        self.0.make_current()
+    }
+
+    fn is_current(&self) -> bool {
+        self.0.is_current()
+    }
+
+    fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
+        self.0.get_proc_address(addr)
+    }
+
+    fn swap_buffers(&self) {
+        self.0.swap_buffers()
+    }
+
+    fn get_api(&self) -> Api {
+        self.0.get_api()
+    }
+
+    fn get_pixel_format(&self) -> PixelFormat {
+        self.0.get_pixel_format()
+    }
+}
+
+unsafe impl Send for HeadlessContext {}
+unsafe impl Sync for HeadlessContext {}
diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
index 63a0118..1e12a80 100644
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -1,7 +1,13 @@
 #![cfg(target_os = "linux")]
 
-#[cfg(feature = "headless")]
-pub use api::osmesa::OsMesaContext as HeadlessContext;
+use Api;
+use BuilderAttribs;
+use CreationError;
+use GlContext;
+use PixelFormat;
+use libc;
+
+use api::osmesa::{self, OsMesaContext};
 
 #[cfg(feature = "window")]
 pub use api::x11::{Window, WindowProxy, MonitorID, get_available_monitors, get_primary_monitor};
@@ -12,3 +18,49 @@ pub use api::x11::{WaitEventsIterator, PollEventsIterator};
 pub type Window = ();       // TODO: hack to make things work
 #[cfg(not(feature = "window"))]
 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) {
+            Ok(c) => return Ok(HeadlessContext(c)),
+            Err(osmesa::OsMesaCreationError::NotSupported) => (),
+            Err(osmesa::OsMesaCreationError::CreationError(e)) => return Err(e),
+        };
+
+        Err(CreationError::NotSupported)
+    }
+}
+
+impl GlContext for HeadlessContext {
+    #[inline]
+    unsafe fn make_current(&self) {
+        self.0.make_current()
+    }
+
+    #[inline]
+    fn is_current(&self) -> bool {
+        self.0.is_current()
+    }
+
+    #[inline]
+    fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
+        self.0.get_proc_address(addr)
+    }
+
+    #[inline]
+    fn swap_buffers(&self) {
+        self.0.swap_buffers()
+    }
+
+    #[inline]
+    fn get_api(&self) -> Api {
+        self.0.get_api()
+    }
+
+    #[inline]
+    fn get_pixel_format(&self) -> PixelFormat {
+        self.0.get_pixel_format()
+    }
+}
diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs
index 78cbefc..260ab94 100644
--- a/src/platform/windows/mod.rs
+++ b/src/platform/windows/mod.rs
@@ -2,9 +2,13 @@
 
 pub use api::win32::*;
 
+use libc;
+
 use Api;
 use BuilderAttribs;
 use CreationError;
+use PixelFormat;
+use GlContext;
 
 ///
 pub struct HeadlessContext(Window);
@@ -14,20 +18,30 @@ impl HeadlessContext {
         builder.visible = false;
         Window::new(builder).map(|w| HeadlessContext(w))
     }
+}
 
-    pub unsafe fn make_current(&self) {
+impl GlContext for HeadlessContext {
+    unsafe fn make_current(&self) {
         self.0.make_current()
     }
 
-    pub fn is_current(&self) -> bool {
+    fn is_current(&self) -> bool {
         self.0.is_current()
     }
 
-    pub fn get_proc_address(&self, addr: &str) -> *const () {
+    fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
         self.0.get_proc_address(addr)
     }
 
-    pub fn get_api(&self) -> Api {
+    fn swap_buffers(&self) {
+        self.0.swap_buffers()
+    }
+
+    fn get_api(&self) -> Api {
         self.0.get_api()
     }
+
+    fn get_pixel_format(&self) -> PixelFormat {
+        self.0.get_pixel_format()
+    }
 }