brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Drop COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT

Browse Source 
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2145>
This commit is contained in:
Georges Basile Stavracas Neto 2021-12-07 18:36:27 -03:00
parent 87a66830dc
commit 3cd77f8a79
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-defines.h.meson
View File

@ -39,7 +39,6 @@
#mesondefine COGL_HAS_GL #mesondefine COGL_HAS_GL
#mesondefine CLUTTER_COGL_HAS_GL #mesondefine CLUTTER_COGL_HAS_GL
#mesondefine COGL_HAS_GLX_SUPPORT #mesondefine COGL_HAS_GLX_SUPPORT
#mesondefine COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT #mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
#mesondefine COGL_HAS_EGL_SUPPORT #mesondefine COGL_HAS_EGL_SUPPORT
#mesondefine COGL_HAS_X11 #mesondefine COGL_HAS_X11

1
cogl/cogl/meson.build
View File

@ -5,7 +5,6 @@ cdata = configuration_data()
cdata.set('COGL_HAS_GL', have_gl) cdata.set('COGL_HAS_GL', have_gl)
cdata.set('CLUTTER_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_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_PLATFORM_XLIB_SUPPORT', have_egl_xlib)
cdata.set('COGL_HAS_EGL_SUPPORT', have_egl) cdata.set('COGL_HAS_EGL_SUPPORT', have_egl)
cdata.set('COGL_HAS_X11', have_x11) cdata.set('COGL_HAS_X11', have_x11)

2
cogl/cogl/winsys/cogl-winsys-egl.c
View File

@ -674,7 +674,7 @@ _cogl_egl_create_image (CoglContext *ctx,
egl_ctx = EGL_NO_CONTEXT; egl_ctx = EGL_NO_CONTEXT;
else else
#endif #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 /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used
* in conjunction with the EGL_WAYLAND_BUFFER_WL target */ * in conjunction with the EGL_WAYLAND_BUFFER_WL target */
if (target == EGL_WAYLAND_BUFFER_WL) if (target == EGL_WAYLAND_BUFFER_WL)