aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Berger <victor.berger@m4x.org>2015-12-30 23:09:27 +0100
committerVictor Berger <victor.berger@m4x.org>2016-01-03 12:19:53 +0100
commit508e8cf665d36bdb6e7b5d3d81e1118693579f5b (patch)
tree23d2a094f63d102740e18a5188f15e7b24b55a40
parentcab61a1367187199e14e8f3b24596c4a4ec7e22f (diff)
downloadglutin-508e8cf665d36bdb6e7b5d3d81e1118693579f5b.tar.gz
glutin-508e8cf665d36bdb6e7b5d3d81e1118693579f5b.zip
Fix EGL for wayland.
-rw-r--r--src/api/egl/mod.rs12
-rw-r--r--src/lib.rs2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/api/egl/mod.rs b/src/api/egl/mod.rs
index 582e376..ca3dc2a 100644
--- a/src/api/egl/mod.rs
+++ b/src/api/egl/mod.rs
@@ -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);
}
- if egl_version >= &(1, 3) {
- out.push(ffi::egl::SURFACE_TYPE as c_int);
- out.push((ffi::egl::WINDOW_BIT | ffi::egl::PBUFFER_BIT) as c_int);
- }
+ out.push(ffi::egl::SURFACE_TYPE 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) {
(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::OpenGl, Some((1, _))) => {
+ (Api::OpenGl, _) => {
if egl_version < &(1, 3) { return Err(CreationError::NoAvailablePixelFormat); }
out.push(ffi::egl::RENDERABLE_TYPE 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
};
diff --git a/src/lib.rs b/src/lib.rs
index 6cc0da7..2bd7fe3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -461,7 +461,7 @@ impl Default for PixelFormatRequirements {
alpha_bits: Some(8),
depth_bits: Some(24),
stencil_bits: Some(8),
- double_buffer: Some(true),
+ double_buffer: None,
multisampling: None,
stereoscopy: false,
srgb: false,