From 3cd77f8a79cf8015e4988ecab061fa411cd57f9b Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 7 Dec 2021 18:36:27 -0300 Subject: [PATCH] cogl: Drop COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT The only place where this define is used can be replaced by checking EGL_WL_bind_wayland_display, which is done in that same file already. Part-of: --- cogl/cogl/cogl-defines.h.meson | 1 - cogl/cogl/meson.build | 1 - cogl/cogl/winsys/cogl-winsys-egl.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cogl/cogl/cogl-defines.h.meson b/cogl/cogl/cogl-defines.h.meson index 4c9535239..911b0abdd 100644 --- a/cogl/cogl/cogl-defines.h.meson +++ b/cogl/cogl/cogl-defines.h.meson @@ -39,7 +39,6 @@ #mesondefine COGL_HAS_GL #mesondefine CLUTTER_COGL_HAS_GL #mesondefine COGL_HAS_GLX_SUPPORT -#mesondefine COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT #mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT #mesondefine COGL_HAS_EGL_SUPPORT #mesondefine COGL_HAS_X11 diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index f73d29f87..531cf8f43 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -5,7 +5,6 @@ cdata = configuration_data() cdata.set('COGL_HAS_GL', have_gl) cdata.set('CLUTTER_COGL_HAS_GL', have_gl) cdata.set('COGL_HAS_GLX_SUPPORT', have_glx) -cdata.set('COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT', have_wayland) cdata.set('COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT', have_egl_xlib) cdata.set('COGL_HAS_EGL_SUPPORT', have_egl) cdata.set('COGL_HAS_X11', have_x11) diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c index 8ea1008b5..99afdca8f 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl.c +++ b/cogl/cogl/winsys/cogl-winsys-egl.c @@ -674,7 +674,7 @@ _cogl_egl_create_image (CoglContext *ctx, egl_ctx = EGL_NO_CONTEXT; else #endif -#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT +#ifdef EGL_WL_bind_wayland_display /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ if (target == EGL_WAYLAND_BUFFER_WL)