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

Merge pull request #690 from vberger/master

Browse source 
Fix EGL for wayland.
This commit is contained in:
tomaka 2016-01-03 12:44:04 +01:00
parent 89e7a2fda7 508e8cf665
commit f59be2588c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/egl/mod.rs
View file

@ -466,10 +466,10 @@ unsafe fn choose_fbconfig(egl: &ffi::egl::Egl, display: ffi::egl::types::EGLDisp
out.push(ffi::egl::RGB_BUFFER as c_int); out.push(ffi::egl::RGB_BUFFER as c_int);
} }
if egl_version >= &(1, 3) {
out.push(ffi::egl::SURFACE_TYPE as c_int); out.push(ffi::egl::SURFACE_TYPE as c_int);
out.push((ffi::egl::WINDOW_BIT | ffi::egl::PBUFFER_BIT) as c_int); // TODO: Some versions of Mesa report a BAD_ATTRIBUTE error
} // if we ask for PBUFFER_BIT as well as WINDOW_BIT
out.push((ffi::egl::WINDOW_BIT) as c_int);
match (api, version) { match (api, version) {
(Api::OpenGlEs, Some((3, _))) => { (Api::OpenGlEs, Some((3, _))) => {
@ -495,7 +495,7 @@ unsafe fn choose_fbconfig(egl: &ffi::egl::Egl, display: ffi::egl::types::EGLDisp
} }
}, },
(Api::OpenGlEs, _) => unimplemented!(), (Api::OpenGlEs, _) => unimplemented!(),
(Api::OpenGl, Some((1, _))) => { (Api::OpenGl, _) => {
if egl_version < &(1, 3) { return Err(CreationError::NoAvailablePixelFormat); } if egl_version < &(1, 3) { return Err(CreationError::NoAvailablePixelFormat); }
out.push(ffi::egl::RENDERABLE_TYPE as c_int); out.push(ffi::egl::RENDERABLE_TYPE as c_int);
out.push(ffi::egl::OPENGL_BIT as c_int); out.push(ffi::egl::OPENGL_BIT as c_int);
@ -561,7 +561,7 @@ unsafe fn choose_fbconfig(egl: &ffi::egl::Egl, display: ffi::egl::types::EGLDisp
}, },
} }
out.push(0); out.push(ffi::egl::NONE as c_int);
out out
}; };

2
src/lib.rs
View file

@ -461,7 +461,7 @@ impl Default for PixelFormatRequirements {
alpha_bits: Some(8), alpha_bits: Some(8),
depth_bits: Some(24), depth_bits: Some(24),
stencil_bits: Some(8), stencil_bits: Some(8),
double_buffer: Some(true), double_buffer: None,
multisampling: None, multisampling: None,
stereoscopy: false, stereoscopy: false,
srgb: false, srgb: false,