alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Add support to Linux headless implementation for specifying OpenGL version.

Browse source 
This allows creation of GL3+ headless OSMesa contexts on Linux.
This commit is contained in:
Glenn Watson 2016-08-17 10:57:34 +10:00
parent 91dc80b968
commit 1eb2052bcf
2 changed files with 52 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/api/osmesa/mod.rs
View file

@ -7,6 +7,8 @@ use ContextError;
use CreationError;
use GlAttributes;
use GlContext;
use GlProfile;
use GlRequest;
use PixelFormat;
use PixelFormatRequirements;
use Robustness;
@ -34,7 +36,7 @@ impl From<CreationError> for OsMesaCreationError {
}
impl OsMesaContext {
pub fn new(dimensions: (u32, u32), pf_reqs: &PixelFormatRequirements,
pub fn new(dimensions: (u32, u32), _pf_reqs: &PixelFormatRequirements,
opengl: &GlAttributes<&OsMesaContext>) -> Result<OsMesaContext, OsMesaCreationError>
{
if let Err(_) = osmesa_sys::OsMesa::try_loading() {
@ -51,7 +53,44 @@ impl OsMesaContext {
}
// TODO: use `pf_reqs` for the format
// TODO: check OpenGL version and return `OpenGlVersionNotSupported` if necessary
let mut attribs = Vec::new();
if let Some(profile) = opengl.profile {
attribs.push(osmesa_sys::OSMESA_PROFILE);
match profile {
GlProfile::Compatibility => {
attribs.push(osmesa_sys::OSMESA_COMPAT_PROFILE);
}
GlProfile::Core => {
attribs.push(osmesa_sys::OSMESA_CORE_PROFILE);
}
}
}
match opengl.version {
GlRequest::Latest => {},
GlRequest::Specific(Api::OpenGl, (major, minor)) => {
attribs.push(osmesa_sys::OSMESA_CONTEXT_MAJOR_VERSION);
attribs.push(major as libc::c_int);
attribs.push(osmesa_sys::OSMESA_CONTEXT_MINOR_VERSION);
attribs.push(minor as libc::c_int);
},
GlRequest::Specific(Api::OpenGlEs, _) => {
return Err(OsMesaCreationError::NotSupported);
},
GlRequest::Specific(_, _) => return Err(OsMesaCreationError::NotSupported),
GlRequest::GlThenGles { opengl_version: (major, minor), .. } => {
attribs.push(osmesa_sys::OSMESA_CONTEXT_MAJOR_VERSION);
attribs.push(major as libc::c_int);
attribs.push(osmesa_sys::OSMESA_CONTEXT_MINOR_VERSION);
attribs.push(minor as libc::c_int);
},
}
// attribs array must be NULL terminated.
attribs.push(0);
Ok(OsMesaContext {
width: dimensions.0,
@ -59,9 +98,9 @@ impl OsMesaContext {
buffer: ::std::iter::repeat(unsafe { mem::uninitialized() })
.take((dimensions.0 * dimensions.1) as usize).collect(),
context: unsafe {
let ctxt = osmesa_sys::OSMesaCreateContext(0x1908, ptr::null_mut());
let ctxt = osmesa_sys::OSMesaCreateContextAttribs(attribs.as_ptr(), ptr::null_mut());
if ctxt.is_null() {
return Err(CreationError::OsError("OSMesaCreateContext failed".to_string()).into());
return Err(CreationError::OsError("OSMesaCreateContextAttribs failed".to_string()).into());
}
ctxt
}

10
src/headless.rs
View file

@ -2,6 +2,7 @@ use Api;
use ContextError;
use CreationError;
use GlAttributes;
use GlProfile;
use GlRequest;
use GlContext;
use PixelFormat;
@ -45,6 +46,13 @@ impl<'a> HeadlessRendererBuilder<'a> {
self
}
/// Sets the desired OpenGL context profile.
#[inline]
pub fn with_gl_profile(mut self, profile: GlProfile) -> HeadlessRendererBuilder<'a> {
self.opengl.profile = Some(profile);
self
}
/// Sets the *debug* flag for the OpenGL context.
///
/// The default value for this flag is `cfg!(ndebug)`, which means that it's enabled
@ -95,7 +103,7 @@ impl HeadlessContext {
pub unsafe fn make_current(&self) -> Result<(), ContextError> {
self.context.make_current()
}
/// Returns true if this context is the current one in this thread.
#[inline]
pub fn is_current(&self) -> bool {