[PATCH weston 01/10] compositor-{drm, x11, wayland}: stop including EGL headers here

Jonny Lamb jonny.lamb at collabora.co.uk
Tue Mar 24 05:12:00 PDT 2015


Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 src/compositor-drm.c     | 2 --
 src/compositor-wayland.c | 2 --
 src/compositor-x11.c     | 2 --
 src/gl-renderer.h        | 1 +
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 450920e..c0d0c84 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -52,8 +52,6 @@
 #include "vaapi-recorder.h"
 #include "presentation_timing-server-protocol.h"
 
-#include <EGL/eglext.h>
-
 #ifndef DRM_CAP_TIMESTAMP_MONOTONIC
 #define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
 #endif
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 4f792b1..84c8731 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -45,8 +45,6 @@
 #include "fullscreen-shell-client-protocol.h"
 #include "presentation_timing-server-protocol.h"
 
-#include <EGL/eglext.h>
-
 #define WINDOW_TITLE "Weston Compositor"
 
 #ifndef EGL_PLATFORM_WAYLAND_KHR
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 5654c50..fd914d7 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -53,8 +53,6 @@
 #include "../shared/image-loader.h"
 #include "presentation_timing-server-protocol.h"
 
-#include <EGL/eglext.h>
-
 #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
 
 #ifndef EGL_PLATFORM_X11_KHR
diff --git a/src/gl-renderer.h b/src/gl-renderer.h
index c5550d1..d4da567 100644
--- a/src/gl-renderer.h
+++ b/src/gl-renderer.h
@@ -27,6 +27,7 @@
 #ifdef ENABLE_EGL
 
 #include <EGL/egl.h>
+#include <EGL/eglext.h>
 
 #else
 
-- 
2.1.4



More information about the wayland-devel mailing list