Add new define EGL_NO_X11 for newer mesa library

Define both MESA_EGL_NO_X11_HEADERS and EGL_NO_X11 for backward combatibility.
5 years ago · 41cbb80e25
parent 21b75e5d12
commit 41cbb80e25
3 changed files with 18 additions and 3 deletions
--- a/glgen.sh
+++ b/glgen.sh
@ -64,9 +64,14 @@ cat > "$OUTDIR/$BASE.h" << EOF
 #include <stdbool.h>
 #include <wlr/config.h>

-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
+#ifndef MESA_EGL_NO_X11_HEADERS
 #define MESA_EGL_NO_X11_HEADERS
 #endif
+#ifndef EGL_NO_X11
+#define EGL_NO_X11
+#endif
+#endif

 #include <EGL/egl.h>
 #include <EGL/eglext.h>
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@ -11,9 +11,14 @@

 #include <wlr/config.h>

-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
+#ifndef MESA_EGL_NO_X11_HEADERS
 #define MESA_EGL_NO_X11_HEADERS
 #endif
+#ifndef EGL_NO_X11
+#define EGL_NO_X11
+#endif
+#endif

 #include <EGL/egl.h>
 #include <EGL/eglext.h>
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@ -11,9 +11,14 @@

 #include <wlr/config.h>

-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
+#ifndef MESA_EGL_NO_X11_HEADERS
 #define MESA_EGL_NO_X11_HEADERS
 #endif
+#ifndef EGL_NO_X11
+#define EGL_NO_X11
+#endif
+#endif

 #include <EGL/egl.h>
 #include <EGL/eglext.h>