diff options
| author | Robert Bragg <robert.bragg@intel.com> | 2014-03-14 13:33:07 +0000 |
|---|---|---|
| committer | Robert Bragg <robert.bragg@intel.com> | 2014-03-20 17:34:01 +0000 |
| commit | 3917690f5a3bac4b4013ec6d09b1e3ccc74a290b (patch) | |
| tree | f7bf94ceb45640d9090bf3a3bb443e77e5ca94d5 | |
| parent | 18b8035dcf42e4175eff37a0a01f6b5f2f3977a0 (diff) | |
| download | cogl-3917690f5a3bac4b4013ec6d09b1e3ccc74a290b.tar.gz | |
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>
| -rw-r--r-- | cogl/winsys/cogl-winsys-egl-feature-functions.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cogl/winsys/cogl-winsys-egl-feature-functions.h b/cogl/winsys/cogl-winsys-egl-feature-functions.h index 81c4b986..dab52c83 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", |