OsMesa

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

Author: goddessfreya

glutin/Cargo.toml

@@ -19,7 +19,6 @@ serde = ["winit/serde"]
 [dependencies]
 lazy_static = "1.3"
 winit = "0.20.0-alpha1"
-log = "0.4"
 bitflags = "1.1"
 
 [target.'cfg(target_os = "android")'.dependencies]
@@ -60,3 +59,4 @@ glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
 glutin_glx_sys = { version = "0.1.5", path = "../glutin_glx_sys" }
 derivative = "1.0"
 parking_lot = "0.8"
+log = "0.4"

glutin/src/api/osmesa.rs

@@ -19,8 +19,8 @@ use crate::{
 use winit::dpi;
 
 use std::ffi::CString;
-use std::os::raw;
 use std::mem::MaybeUninit;
+use std::os::raw;
 
 #[derive(Debug)]
 pub struct OsMesaContext {
@@ -159,7 +159,7 @@ impl OsMesaContext {
     #[inline]
     pub unsafe fn make_current_osmesa_buffer(
         &self,
-        buffer: &mut OsMesaBuffer,
+        buffer: &OsMesaBuffer,
     ) -> Result<(), ContextError> {
         let ret = osmesa_sys::OSMesaMakeCurrent(
             self.context,

glutin/src/lib.rs

@@ -83,6 +83,13 @@ extern crate lazy_static;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;
+#[cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd",
+))]
 #[macro_use]
 extern crate log;
 #[cfg(any(

glutin/src/platform/unix.rs

@@ -6,6 +6,7 @@
     target_os = "openbsd",
 ))]
 
+pub mod osmesa;
 // mod rawext;
 
 use crate::platform::ContextTraitExt;

glutin/src/platform/unix/osmesa.rs

@@ -0,0 +1,83 @@
+use crate::api::osmesa;
+use crate::{
+    Api, ContextBuilderWrapper, ContextError, CreationError, PixelFormat,
+};
+use winit::dpi;
+
+#[derive(Debug)]
+pub struct OsMesaContext {
+    pub(crate) context: osmesa::OsMesaContext,
+}
+
+pub trait OsMesaContextExt {
+    fn build_osmesa(self) -> Result<OsMesaContext, CreationError>
+    where
+        Self: Sized;
+}
+
+impl<'a> OsMesaContextExt for OsMesaContextBuilder<'a> {
+    #[inline]
+    fn build_osmesa(self) -> Result<OsMesaContext, CreationError>
+    where
+        Self: Sized,
+    {
+        let cb = self.map_sharing(|ctx| &ctx.context);
+        osmesa::OsMesaContext::new(cb).map(|context| OsMesaContext { context })
+    }
+}
+
+pub type OsMesaContextBuilder<'a> = ContextBuilderWrapper<&'a OsMesaContext>;
+
+#[derive(Debug)]
+pub struct OsMesaBuffer {
+    pub(crate) buffer: osmesa::OsMesaBuffer,
+}
+
+impl OsMesaContext {
+    /// Returns the address of an OpenGL function.
+    pub fn get_proc_address(&self, addr: &str) -> *const () {
+        self.context.get_proc_address(addr)
+    }
+
+    pub fn is_current(&self) -> bool {
+        self.context.is_current()
+    }
+
+    pub fn get_api(&self) -> Api {
+        self.context.get_api()
+    }
+
+    pub unsafe fn make_current_osmesa_buffer(
+        &self,
+        buffer: &OsMesaBuffer,
+    ) -> Result<(), ContextError> {
+        self.context.make_current_osmesa_buffer(buffer.inner())
+    }
+
+    pub unsafe fn make_not_current(&self) -> Result<(), ContextError> {
+        self.context.make_not_current()
+    }
+
+    pub(crate) fn inner(&self) -> &osmesa::OsMesaContext {
+        &self.context
+    }
+}
+
+impl OsMesaBuffer {
+    pub(crate) fn inner(&self) -> &osmesa::OsMesaBuffer {
+        &self.buffer
+    }
+
+    pub fn get_pixel_format(&self) -> PixelFormat {
+        self.buffer.get_pixel_format()
+    }
+
+    pub fn new(
+        ctx: &OsMesaContext,
+        size: dpi::PhysicalSize,
+    ) -> Result<OsMesaBuffer, CreationError> {
+        let ctx = ctx.inner();
+        osmesa::OsMesaBuffer::new(ctx, size)
+            .map(|buffer| OsMesaBuffer { buffer })
+    }
+}