egl: fix incorrect #ifdef guarding of features

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.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg 2014-03-14 13:33:07 +00:00
parent 18b8035dcf
commit 3917690f5a

View File

@ -97,6 +97,7 @@ COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglQueryWaylandBuffer,
struct wl_resource *buffer, struct wl_resource *buffer,
EGLint attribute, EGLint *value)) EGLint attribute, EGLint *value))
COGL_WINSYS_FEATURE_END () COGL_WINSYS_FEATURE_END ()
#endif /* EGL_WL_bind_wayland_display */
COGL_WINSYS_FEATURE_BEGIN (create_context, COGL_WINSYS_FEATURE_BEGIN (create_context,
"KHR\0", "KHR\0",
@ -110,8 +111,6 @@ COGL_WINSYS_FEATURE_BEGIN (buffer_age,
COGL_EGL_WINSYS_FEATURE_BUFFER_AGE) COGL_EGL_WINSYS_FEATURE_BUFFER_AGE)
COGL_WINSYS_FEATURE_END () COGL_WINSYS_FEATURE_END ()
#endif
COGL_WINSYS_FEATURE_BEGIN (swap_buffers_with_damage, COGL_WINSYS_FEATURE_BEGIN (swap_buffers_with_damage,
"EXT\0", "EXT\0",
"swap_buffers_with_damage\0", "swap_buffers_with_damage\0",