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

Fix wrong screen ID used on GLX

Browse source
This commit is contained in:
Pierre Krieger 2016-01-05 18:05:02 +01:00
parent f59be2588c
commit 8319043298
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/api/glx/mod.rs
View file

@ -38,8 +38,8 @@ fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) ->
impl Context { impl Context {
pub fn new<'a>(glx: ffi::glx::Glx, xlib: &ffi::Xlib, pf_reqs: &PixelFormatRequirements, pub fn new<'a>(glx: ffi::glx::Glx, xlib: &ffi::Xlib, pf_reqs: &PixelFormatRequirements,
opengl: &'a GlAttributes<&'a Context>, display: *mut ffi::Display) opengl: &'a GlAttributes<&'a Context>, display: *mut ffi::Display,
-> Result<ContextPrototype<'a>, CreationError> screen_id: libc::c_int) -> Result<ContextPrototype<'a>, CreationError>
{ {
// This is completely ridiculous, but VirtualBox's OpenGL driver needs some call handled by // This is completely ridiculous, but VirtualBox's OpenGL driver needs some call handled by
// *it* (i.e. not Mesa) to occur before anything else can happen. That is because // *it* (i.e. not Mesa) to occur before anything else can happen. That is because
@ -55,14 +55,14 @@ impl Context {
// loading the list of extensions // loading the list of extensions
let extensions = unsafe { let extensions = unsafe {
let extensions = glx.QueryExtensionsString(display as *mut _, 0); // FIXME: screen number let extensions = glx.QueryExtensionsString(display as *mut _, screen_id);
let extensions = CStr::from_ptr(extensions).to_bytes().to_vec(); let extensions = CStr::from_ptr(extensions).to_bytes().to_vec();
String::from_utf8(extensions).unwrap() String::from_utf8(extensions).unwrap()
}; };
// finding the pixel format we want // finding the pixel format we want
let (fb_config, pixel_format) = unsafe { let (fb_config, pixel_format) = unsafe {
try!(choose_fbconfig(&glx, &extensions, xlib, display, pf_reqs) try!(choose_fbconfig(&glx, &extensions, xlib, display, screen_id, pf_reqs)
.map_err(|_| CreationError::NoAvailablePixelFormat)) .map_err(|_| CreationError::NoAvailablePixelFormat))
}; };
@ -355,7 +355,8 @@ fn create_context(glx: &ffi::glx::Glx, extra_functions: &ffi::glx_extra::Glx, ex
/// Enumerates all available FBConfigs /// Enumerates all available FBConfigs
unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xlib, unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xlib,
display: *mut ffi::Display, reqs: &PixelFormatRequirements) display: *mut ffi::Display, screen_id: libc::c_int,
reqs: &PixelFormatRequirements)
-> Result<(ffi::glx::types::GLXFBConfig, PixelFormat), ()> -> Result<(ffi::glx::types::GLXFBConfig, PixelFormat), ()>
{ {
let descriptor = { let descriptor = {
@ -459,7 +460,7 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli
// calling glXChooseFBConfig // calling glXChooseFBConfig
let fb_config = { let fb_config = {
let mut num_configs = 1; let mut num_configs = 1;
let result = glx.ChooseFBConfig(display as *mut _, 0, descriptor.as_ptr(), let result = glx.ChooseFBConfig(display as *mut _, screen_id, descriptor.as_ptr(),
&mut num_configs); &mut num_configs);
if result.is_null() { return Err(()); } if result.is_null() { return Err(()); }
if num_configs == 0 { return Err(()); } if num_configs == 0 { return Err(()); }

2
src/api/x11/window.rs
View file

@ -366,7 +366,7 @@ impl Window {
// GLX should be preferred over EGL, otherwise crashes may occur // GLX should be preferred over EGL, otherwise crashes may occur
// on X11 – issue #314 // on X11 – issue #314
if let Some(ref glx) = display.glx { if let Some(ref glx) = display.glx {
Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, pf_reqs, &builder_clone_opengl_glx, display.display))) Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, pf_reqs, &builder_clone_opengl_glx, display.display, screen_id)))
} else if let Some(ref egl) = display.egl { } else if let Some(ref egl) = display.egl {
Prototype::Egl(try!(EglContext::new(egl.clone(), pf_reqs, &builder_clone_opengl_egl, egl::NativeDisplay::X11(Some(display.display as *const _))))) Prototype::Egl(try!(EglContext::new(egl.clone(), pf_reqs, &builder_clone_opengl_egl, egl::NativeDisplay::X11(Some(display.display as *const _)))))
} else { } else {