Remove the "headless" feature

src/platform/android/mod.rs

@@ -2,10 +2,8 @@
 
 pub use api::android::*;
 
-#[cfg(feature = "headless")]
 pub struct HeadlessContext(i32);
 
-#[cfg(feature = "headless")]
 impl HeadlessContext {
     /// See the docs in the crate root file.
     pub fn new(_builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
@@ -32,7 +30,5 @@ impl HeadlessContext {
     }
 }
 
-#[cfg(feature = "headless")]
 unsafe impl Send for HeadlessContext {}
-#[cfg(feature = "headless")]
 unsafe impl Sync for HeadlessContext {}

src/platform/emscripten/mod.rs

@@ -5,10 +5,8 @@ use GlContext;
 pub use api::emscripten::{Window, WindowProxy, MonitorID, get_available_monitors};
 pub use api::emscripten::{get_primary_monitor, WaitEventsIterator, PollEventsIterator};
 
-#[cfg(feature = "headless")]
 pub struct HeadlessContext(Window);
 
-#[cfg(feature = "headless")]
 impl HeadlessContext {
     /// See the docs in the crate root file.
     pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
@@ -16,7 +14,6 @@ impl HeadlessContext {
     }
 }
 
-#[cfg(feature = "headless")]
 impl GlContext for HeadlessContext {
     unsafe fn make_current(&self) {
         self.0.make_current()
@@ -43,7 +40,5 @@ impl GlContext for HeadlessContext {
     }
 }
 
-#[cfg(feature = "headless")]
 unsafe impl Send for HeadlessContext {}
-#[cfg(feature = "headless")]
 unsafe impl Sync for HeadlessContext {}

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()
+    }
+}