From 508e8cf665d36bdb6e7b5d3d81e1118693579f5b Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Wed, 30 Dec 2015 23:09:27 +0100
Subject: Fix EGL for wayland.

---
 src/api/egl/mod.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/api')

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
     };
 
-- 
cgit v1.2.3