blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add new define EGL_NO_X11 for newer mesa library 

Define both MESA_EGL_NO_X11_HEADERS and EGL_NO_X11 for
backward combatibility.
This commit is contained in:
Danilo Spinella 2019-10-16 15:16:53 +02:00 committed by Simon Ser
parent 21b75e5d12
commit 41cbb80e25
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glgen.sh
View File

@ -64,9 +64,14 @@ cat > "$OUTDIR/$BASE.h" << EOF
#include <stdbool.h> #include <stdbool.h>
#include <wlr/config.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 #define MESA_EGL_NO_X11_HEADERS
#endif #endif
#ifndef EGL_NO_X11
#define EGL_NO_X11
#endif
#endif
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>

7
include/wlr/render/egl.h
View File

@ -11,9 +11,14 @@
#include <wlr/config.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 #define MESA_EGL_NO_X11_HEADERS
#endif #endif
#ifndef EGL_NO_X11
#define EGL_NO_X11
#endif
#endif
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>

7
include/wlr/render/interface.h
View File

@ -11,9 +11,14 @@
#include <wlr/config.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 #define MESA_EGL_NO_X11_HEADERS
#endif #endif
#ifndef EGL_NO_X11
#define EGL_NO_X11
#endif
#endif
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>