aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Anderson <ascent12@hotmail.com>2017-10-21 14:48:58 +1300
committerScott Anderson <ascent12@hotmail.com>2017-10-22 10:36:07 +1300
commit9b984253e2b878128d2042836a8c86228700b1ee (patch)
tree55acb26536f2100e56bc9cfe7fce8213014a2748
parent1782d5e7b7dc5e494cfee72b758d5fa8114aecc8 (diff)
Move egl.h to render/egl.h
-rw-r--r--backend/drm/backend.c2
-rw-r--r--backend/drm/renderer.c2
-rw-r--r--backend/wayland/backend.c2
-rw-r--r--backend/x11/backend.c2
-rw-r--r--include/backend/drm/drm.h2
-rw-r--r--include/backend/wayland.h2
-rw-r--r--include/backend/x11.h2
-rw-r--r--include/render/gles2.h2
-rw-r--r--include/wlr/backend.h2
-rw-r--r--include/wlr/backend/interface.h2
-rw-r--r--include/wlr/render/egl.h (renamed from include/wlr/egl.h)0
-rw-r--r--render/egl.c2
-rw-r--r--render/gles2/renderer.c2
-rw-r--r--render/gles2/texture.c2
-rw-r--r--types/wlr_surface.c2
15 files changed, 14 insertions, 14 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index d7e2e616..ab66adf5 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -11,7 +11,7 @@
#include <wlr/interfaces/wlr_output.h>
#include <wlr/util/list.h>
#include <wlr/util/log.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include "backend/drm/drm.h"
static bool wlr_drm_backend_start(struct wlr_backend *backend) {
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 0d338490..d53acaa8 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -8,8 +8,8 @@
#include <EGL/eglext.h>
#include <wayland-util.h>
-#include <wlr/egl.h>
#include <wlr/util/log.h>
+#include <wlr/render/egl.h>
#include <wlr/render/matrix.h>
#include <wlr/render/gles2.h>
#include <wlr/render.h>
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index e57f3583..5018eeb0 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -4,7 +4,7 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <wayland-server.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 11dd8568..4ecca325 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -15,7 +15,7 @@
#endif
#include <wlr/backend/interface.h>
#include <wlr/backend/x11.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 6106a85a..7a0e43ea 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -12,7 +12,7 @@
#include <wlr/backend/session.h>
#include <wlr/backend/drm.h>
#include <wlr/types/wlr_output.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/util/list.h>
#include "iface.h"
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 508a7f52..88aeabca 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -5,7 +5,7 @@
#include <wayland-client.h>
#include <wayland-server.h>
#include <wayland-egl.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/backend/wayland.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
diff --git a/include/backend/x11.h b/include/backend/x11.h
index b4284b63..f5ec56bc 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -5,7 +5,7 @@
#include <xcb/xcb.h>
#include <X11/Xlib-xcb.h>
#include <wayland-server.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 688a51dd..0b7032cc 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -8,9 +8,9 @@
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <wlr/egl.h>
#include <wlr/backend.h>
#include <wlr/render.h>
+#include <wlr/render/egl.h>
#include <wlr/render/interface.h>
#include <wlr/util/log.h>
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 6c11152f..78d01edf 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -3,7 +3,7 @@
#include <wayland-server.h>
#include <wlr/backend/session.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
struct wlr_backend_impl;
diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h
index ea41400a..3f0aaadb 100644
--- a/include/wlr/backend/interface.h
+++ b/include/wlr/backend/interface.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <wlr/backend.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
struct wlr_backend_impl {
bool (*start)(struct wlr_backend *backend);
diff --git a/include/wlr/egl.h b/include/wlr/render/egl.h
index 9ab4d9ce..9ab4d9ce 100644
--- a/include/wlr/egl.h
+++ b/include/wlr/render/egl.h
diff --git a/render/egl.c b/render/egl.c
index 9815b923..08612125 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -3,7 +3,7 @@
#include <GLES2/gl2.h>
#include <stdlib.h>
#include <wlr/util/log.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include "render/glapi.h"
// Extension documentation
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index 94c50b9a..cf4a0aab 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -5,9 +5,9 @@
#include <GLES2/gl2ext.h>
#include <wayland-util.h>
#include <wayland-server-protocol.h>
-#include <wlr/egl.h>
#include <wlr/backend.h>
#include <wlr/render.h>
+#include <wlr/render/egl.h>
#include <wlr/render/interface.h>
#include <wlr/render/matrix.h>
#include <wlr/util/log.h>
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 5e934aa4..ff71cb08 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -5,8 +5,8 @@
#include <GLES2/gl2ext.h>
#include <wayland-util.h>
#include <wayland-server-protocol.h>
-#include <wlr/egl.h>
#include <wlr/render.h>
+#include <wlr/render/egl.h>
#include <wlr/render/interface.h>
#include <wlr/render/matrix.h>
#include <wlr/util/log.h>
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 9e38d701..68c21468 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -2,9 +2,9 @@
#include <stdlib.h>
#include <wayland-server.h>
#include <wlr/util/log.h>
-#include <wlr/egl.h>
#include <wlr/render/interface.h>
#include <wlr/types/wlr_surface.h>
+#include <wlr/render/egl.h>
#include <wlr/render/matrix.h>
static void wlr_surface_state_reset_buffer(struct wlr_surface_state *state) {