OSMesa and drop CI

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

.circleci/config.yml

@@ -12,7 +12,7 @@ pub mod ffi {
 
 use crate::{
     Api, ContextError, CreationError, GlAttributes, GlProfile, GlRequest,
-    PixelFormatRequirements, Robustness,
+    PixelFormatRequirements, Robustness, ContextBuilderWrapper, PixelFormat
 };
 use crate::platform_impl::PlatformAttributes;
 
@@ -24,6 +24,10 @@ use std::os::raw;
 #[derive(Debug)]
 pub struct OsMesaContext {
     context: osmesa_sys::OSMesaContext,
+}
+
+#[derive(Debug)]
+pub struct OsMesaBuffer {
     buffer: Vec<u32>,
     width: u32,
     height: u32,
@@ -70,20 +74,17 @@ impl std::error::Error for LoadingError {
 
 impl OsMesaContext {
     pub fn new(
-        _pf_reqs: &PixelFormatRequirements,
-        opengl: &GlAttributes<&OsMesaContext>,
-        _: &PlatformAttributes,
-        size: dpi::PhysicalSize,
+        cb: ContextBuilderWrapper<&'_ OsMesaContext>,
     ) -> Result<Self, CreationError> {
         osmesa_sys::OsMesa::try_loading()
             .map_err(LoadingError::new)
             .map_err(|e| CreationError::NoBackendAvailable(Box::new(e)))?;
 
-        if opengl.sharing.is_some() {
+        if cb.gl_attr.sharing.is_some() {
             panic!("Context sharing not possible with OsMesa")
         }
 
-        match opengl.robustness {
+        match cb.gl_attr.robustness {
             Robustness::RobustNoResetNotification
             | Robustness::RobustLoseContextOnReset => {
                 return Err(CreationError::RobustnessNotSupported.into());
@@ -95,7 +96,7 @@ impl OsMesaContext {
 
         let mut attribs = Vec::new();
 
-        if let Some(profile) = opengl.profile {
+        if let Some(profile) = cb.gl_attr.profile {
             attribs.push(osmesa_sys::OSMESA_PROFILE);
 
             match profile {
@@ -108,7 +109,7 @@ impl OsMesaContext {
             }
         }
 
-        match opengl.version {
+        match cb.gl_attr.version {
             GlRequest::Latest => {}
             GlRequest::Specific(Api::OpenGl, (major, minor)) => {
                 attribs.push(osmesa_sys::OSMESA_CONTEXT_MAJOR_VERSION);
@@ -136,14 +137,7 @@ impl OsMesaContext {
         // attribs array must be NULL terminated.
         attribs.push(0);
 
-        let size: (u32, u32) = size.into();
-
         Ok(OsMesaContext {
-            width: size.0,
-            height: size.1,
-            buffer: std::iter::repeat(unsafe { std::mem::uninitialized() })
-                .take((size.0 * size.1) as usize)
-                .collect(),
             context: unsafe {
                 let ctx = osmesa_sys::OSMesaCreateContextAttribs(
                     attribs.as_ptr(),
@@ -160,13 +154,13 @@ impl OsMesaContext {
     }
 
     #[inline]
-    pub unsafe fn make_current(&self) -> Result<(), ContextError> {
+    pub unsafe fn make_current_osmesa_buffer(&self, buffer: &mut OsMesaBuffer) -> Result<(), ContextError> {
         let ret = osmesa_sys::OSMesaMakeCurrent(
             self.context,
-            self.buffer.as_ptr() as *mut _,
+            buffer.buffer.as_ptr() as *mut _,
             0x1401,
-            self.width as raw::c_int,
-            self.height as raw::c_int,
+            buffer.width as raw::c_int,
+            buffer.height as raw::c_int,
         );
 
         // an error can only happen in case of invalid parameter, which would
@@ -190,6 +184,11 @@ impl OsMesaContext {
             // and seeing if it work.
             //
             // https://gitlab.freedesktop.org/mesa/mesa/merge_requests/533
+            //
+            // EDIT: 2019/06/13: This PR has recieved no attention, and will
+            // likely never be merged in my lifetime :/
+            //
+            // Honestly, just go use EGL-Surfaceless!
             let ret = osmesa_sys::OSMesaMakeCurrent(
                 std::ptr::null_mut(),
                 std::ptr::null_mut(),
@@ -243,3 +242,26 @@ impl Drop for OsMesaContext {
 
 unsafe impl Send for OsMesaContext {}
 unsafe impl Sync for OsMesaContext {}
+
+impl OsMesaBuffer {
+    pub fn new(ctx: &OsMesaContext, size: dpi::PhysicalSize) -> Result<Self, CreationError> {
+        let size: (u32, u32) = size.into();
+        Ok(OsMesaBuffer {
+            width: size.0,
+            height: size.1,
+            buffer: std::iter::repeat(unsafe { std::mem::uninitialized() })
+                .take((size.0 * size.1) as usize)
+                .collect(),
+        })
+    }
+
+    #[inline]
+    pub fn is_current(&self) -> bool {
+        panic!("This cannot be implemented with OsMesa.")
+    }
+
+    #[inline]
+    pub fn get_pixel_format(&self) -> PixelFormat {
+        unimplemented!()
+    }
+}

glutin/src/api/osmesa/mod.rs

@@ -78,7 +78,7 @@
     target_os = "emscripten",
 ))]
 #![deny(
-    warnings,
+    //warnings,
     missing_debug_implementations,
     //missing_docs,
 )]

glutin/src/lib.rs

@@ -6,7 +6,7 @@
     target_os = "openbsd",
 ))]
 
-mod osmesa;
+pub mod osmesa;
 //mod rawext;
 
 use crate::platform::ContextTraitExt;
@@ -16,7 +16,6 @@ pub use glutin_egl_sys::EGLContext;
 pub use glutin_glx_sys::GLXContext;
 
 pub use winit::platform::unix::*;
-pub use self::osmesa::*;
 //pub use self::rawext::*;
 
 use std::os::raw;

glutin/src/platform/unix.rs

@@ -19,7 +19,6 @@ pub trait OsMesaContextExt {
     /// [`Context`]: struct.Context.html
     fn build_osmesa(
         self,
-        size: dpi::PhysicalSize,
     ) -> Result<OsMesaContext<NotCurrent>, CreationError>
     where
         Self: Sized;
@@ -31,24 +30,17 @@ impl<'a, T: ContextCurrentState> OsMesaContextExt
     #[inline]
     fn build_osmesa(
         self,
-        size: dpi::PhysicalSize,
     ) -> Result<OsMesaContext<NotCurrent>, CreationError>
     where
         Self: Sized,
     {
         let cb = self.map_sharing(|ctx| &ctx.context);
-        osmesa::OsMesaContext::new(cb, size).map(
+        osmesa::OsMesaContext::new(cb).map(
             |context| OsMesaContext {
                 context,
                 phantom: PhantomData,
             }
         )
-        //osmesa::OsMesaContext::new(&pf_reqs, &gl_attr, &plat_attr, size)
-        //    .map(|context| Context::OsMesa(context))
-        //    .map(|context| crate::Context {
-        //        context,
-        //        phantom: PhantomData,
-        //    })
     }
 }
 
@@ -130,12 +122,16 @@ impl Surface for OsMesaBuffer {
     fn get_pixel_format(&self) -> PixelFormat {
         self.surface.get_pixel_format()
     }
+
+    fn is_current(&self) -> bool {
+        self.surface.is_current()
+    }
 }
 
 impl OsMesaBuffer {
     pub fn new<CS: ContextCurrentState>(ctx: &OsMesaContext<CS>, size: dpi::PhysicalSize) -> Result<Self, CreationError> {
         let ctx = ctx.inner();
-        osmesa::OsMesaContext::new(ctx, size)
+        osmesa::OsMesaBuffer::new(ctx, size)
             .map(|surface| OsMesaBuffer {
                 surface,
             })

glutin/src/platform/unix/osmesa.rs

@@ -39,14 +39,12 @@ pub enum RawHandle {
 pub enum ContextType {
     X11,
     Wayland,
-    OsMesa,
 }
 
 #[derive(Debug)]
 pub enum Context {
     X11(x11::Context),
     Wayland(wayland::Context),
-    OsMesa(osmesa::OsMesaContext),
 }
 
 impl Context {
@@ -56,15 +54,6 @@ impl Context {
     ) -> Result<(), CreationError> {
         if let Some(c) = *c {
             match ct {
-                ContextType::OsMesa => match *c {
-                    Context::OsMesa(_) => Ok(()),
-                    _ => {
-                        let msg = "Cannot share an OSMesa context with a non-OSMesa context";
-                        return Err(CreationError::PlatformSpecific(
-                            msg.into(),
-                        ));
-                    }
-                },
                 ContextType::X11 => match *c {
                     Context::X11(_) => Ok(()),
                     _ => {
@@ -159,7 +148,6 @@ impl Context {
         match *self {
             Context::X11(ref ctx) => ctx.make_current(),
             Context::Wayland(ref ctx) => ctx.make_current(),
-            Context::OsMesa(ref ctx) => ctx.make_current(),
         }
     }
 
@@ -168,7 +156,6 @@ impl Context {
         match *self {
             Context::X11(ref ctx) => ctx.make_not_current(),
             Context::Wayland(ref ctx) => ctx.make_not_current(),
-            Context::OsMesa(ref ctx) => ctx.make_not_current(),
         }
     }
 
@@ -177,7 +164,6 @@ impl Context {
         match *self {
             Context::X11(ref ctx) => ctx.is_current(),
             Context::Wayland(ref ctx) => ctx.is_current(),
-            Context::OsMesa(ref ctx) => ctx.is_current(),
         }
     }
 
@@ -186,7 +172,6 @@ impl Context {
         match *self {
             Context::X11(ref ctx) => ctx.get_api(),
             Context::Wayland(ref ctx) => ctx.get_api(),
-            Context::OsMesa(ref ctx) => ctx.get_api(),
         }
     }
 
@@ -198,7 +183,6 @@ impl Context {
                 X11Context::Egl(ref ctx) => RawHandle::Egl(ctx.raw_handle()),
             },
             Context::Wayland(ref ctx) => RawHandle::Egl(ctx.raw_handle()),
-            Context::OsMesa(ref ctx) => RawHandle::Egl(ctx.raw_handle()),
         }
     }
 
@@ -212,10 +196,10 @@ impl Context {
     }
 
     #[inline]
-    pub fn resize(&self, width: u32, height: u32) {
+    pub fn resize(&self, size: dpi::PhysicalSize) {
         match *self {
             Context::X11(_) => (),
-            Context::Wayland(ref ctx) => ctx.resize(width, height),
+            Context::Wayland(ref ctx) => ctx.resize(size),
             _ => unreachable!(),
         }
     }
@@ -225,7 +209,6 @@ impl Context {
         match *self {
             Context::X11(ref ctx) => ctx.get_proc_address(addr),
             Context::Wayland(ref ctx) => ctx.get_proc_address(addr),
-            Context::OsMesa(ref ctx) => ctx.get_proc_address(addr),
         }
     }
 

glutin/src/platform_impl/unix/mod.rs

@@ -189,10 +189,10 @@ impl Context {
     }
 
     #[inline]
-    pub fn resize(&self, width: u32, height: u32) {
+    pub fn resize(&self, size: dpi::PhysicalSize) {
         match self {
             Context::Windowed(_, surface) => {
-                surface.0.resize(width as i32, height as i32, 0, 0)
+                surface.0.resize(size.width as i32, size.height as i32, 0, 0)
             }
             _ => unreachable!(),
         }