[Cogl] [PATCH] egl: fix incorrect #ifdef guarding of features

Robert Bragg robert at sixbynine.org
Fri Mar 14 06:40:23 PDT 2014


From: Robert Bragg <robert.bragg at intel.com>

We have an #ifdef EGL_WL_bind_wayland_display guard in
cogl-winsys-egl-feature-functions.h to avoid referencing wayland types
when the EGL header doesn't know about them, but somehow this guard also
ended up around the KHR_create_context and EXT_buffer age features too
even though they aren't wayland specific.
---
 cogl/winsys/cogl-winsys-egl-feature-functions.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cogl/winsys/cogl-winsys-egl-feature-functions.h b/cogl/winsys/cogl-winsys-egl-feature-functions.h
index 81c4b98..dab52c8 100644
--- a/cogl/winsys/cogl-winsys-egl-feature-functions.h
+++ b/cogl/winsys/cogl-winsys-egl-feature-functions.h
@@ -97,6 +97,7 @@ COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglQueryWaylandBuffer,
                                struct wl_resource *buffer,
                                EGLint attribute, EGLint *value))
 COGL_WINSYS_FEATURE_END ()
+#endif /* EGL_WL_bind_wayland_display */
 
 COGL_WINSYS_FEATURE_BEGIN (create_context,
                            "KHR\0",
@@ -110,8 +111,6 @@ COGL_WINSYS_FEATURE_BEGIN (buffer_age,
                            COGL_EGL_WINSYS_FEATURE_BUFFER_AGE)
 COGL_WINSYS_FEATURE_END ()
 
-#endif
-
 COGL_WINSYS_FEATURE_BEGIN (swap_buffers_with_damage,
                            "EXT\0",
                            "swap_buffers_with_damage\0",
-- 
1.9.0



More information about the Cogl mailing list