1 files changed, 20 insertions, 6 deletions
diff --git a/src/api/osmesa/mod.rs b/src/api/osmesa/mod.rs
index 26808f7..db0a1e7 100644
--- a/src/api/osmesa/mod.rs
+++ b/src/api/osmesa/mod.rs
@@ -4,9 +4,11 @@ extern crate osmesa_sys;
 
 use Api;
 use BuilderAttribs;
+use ContextError;
 use CreationError;
 use GlContext;
 use PixelFormat;
+use Robustness;
 use libc;
 use std::{mem, ptr};
 use std::ffi::CString;
@@ -37,6 +39,13 @@ impl OsMesaContext {
 
         let dimensions = builder.dimensions.unwrap();
 
+        match builder.gl_robustness {
+            Robustness::RobustNoResetNotification | Robustness::RobustLoseContextOnReset => {
+                return Err(CreationError::NotSupported.into());
+            },
+            _ => ()
+        }
+
         Ok(OsMesaContext {
             width: dimensions.0,
             height: dimensions.1,
@@ -67,14 +76,18 @@ impl OsMesaContext {
 }
 
 impl GlContext for OsMesaContext {
-    unsafe fn make_current(&self) {
-        let ret = osmesa_sys::OSMesaMakeCurrent(self.context,
-            self.buffer.as_ptr() as *mut libc::c_void,
-            0x1401, self.width as libc::c_int, self.height as libc::c_int);
+    unsafe fn make_current(&self) -> Result<(), ContextError> {
+        let ret = osmesa_sys::OSMesaMakeCurrent(self.context, self.buffer.as_ptr()
+                                                as *mut libc::c_void, 0x1401, self.width
+                                                as libc::c_int, self.height as libc::c_int);
 
+        // an error can only happen in case of invalid parameter, which would indicate a bug
+        // in glutin
         if ret == 0 {
-            panic!("OSMesaMakeCurrent failed")
+            panic!("OSMesaMakeCurrent failed");
         }
+
+        Ok(())
     }
 
     fn is_current(&self) -> bool {
@@ -88,7 +101,8 @@ impl GlContext for OsMesaContext {
         }
     }
 
-    fn swap_buffers(&self) {
+    fn swap_buffers(&self) -> Result<(), ContextError> {
+        Ok(())
     }
 
     fn get_api(&self) -> Api {