diff options
| -rw-r--r-- | backend/drm/drm.c | 2 | ||||
| -rw-r--r-- | backend/drm/renderer.c | 2 | ||||
| -rw-r--r-- | backend/headless/output.c | 2 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 2 | ||||
| -rwxr-xr-x | glgen.sh | 5 | ||||
| -rw-r--r-- | include/render/gles2.h | 2 | ||||
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | rootston/output.c | 1 |
8 files changed, 5 insertions, 13 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index f179f835..f86f63b8 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -2,8 +2,6 @@ #include <assert.h> #include <drm_fourcc.h> #include <drm_mode.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <errno.h> #include <gbm.h> #include <GLES2/gl2.h> diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 72cfd430..1771e725 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -1,6 +1,4 @@ #include <assert.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <gbm.h> #include <stdbool.h> #include <stdlib.h> diff --git a/backend/headless/output.c b/backend/headless/output.c index b3b41d46..6d3b6f96 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -1,6 +1,4 @@ #include <assert.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <stdlib.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/wlr_renderer.h> diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 2a937de7..7c8bb4e0 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -5,8 +5,6 @@ #include <wlr/config.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <wayland-server.h> #include <wlr/backend/interface.h> @@ -62,6 +62,11 @@ cat > "$OUTDIR/$BASE.h" << EOF #define $INCLUDE_GUARD #include <stdbool.h> +#include <wlr/config.h> + +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS +#define MESA_EGL_NO_X11_HEADERS +#endif #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/include/render/gles2.h b/include/render/gles2.h index 593c7d1c..7e0782d4 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -1,8 +1,6 @@ #ifndef RENDER_GLES2_H #define RENDER_GLES2_H -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #include <stdbool.h> diff --git a/render/egl.c b/render/egl.c index 450f8fc7..ceed1fe6 100644 --- a/render/egl.c +++ b/render/egl.c @@ -1,5 +1,3 @@ -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <assert.h> #include <drm_fourcc.h> #include <stdio.h> diff --git a/rootston/output.c b/rootston/output.c index dd1f010b..e83cdc1f 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -13,7 +13,6 @@ #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/log.h> #include <wlr/util/region.h> -#include <wlr/xwayland.h> #include "rootston/config.h" #include "rootston/layers.h" #include "rootston/output.h" |