[cogl/wip/rib/cogl-1.18: 2/11] egl: fix incorrect #ifdef guarding of features



commit 7fd6187f274c8ba04fbe3c05c8894b4d872a1b15
Author: Robert Bragg <robert bragg intel com>
Date:   Fri Mar 14 13:33:07 2014 +0000

    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>

 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 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",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]