From d3f0878d716011bf158b49b063f9391080c22c8a Mon Sep 17 00:00:00 2001
From: Heghedus Razvan <heghedus.razvan@gmail.com>
Date: Sat, 14 Oct 2017 23:33:00 +0300
Subject: Replace list_t with wl_list in wlr_wl_backend

Now wlr_backend->outputs is a list of wlr_wl_backend_output instead of
wlr_output.

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
---
 include/backend/wayland.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include/backend/wayland.h')

diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 508a7f52..bc3b6277 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -9,7 +9,7 @@
 #include <wlr/backend/wayland.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
-#include <wlr/util/list.h>
+#include <wayland-util.h>
 
 struct wlr_wl_backend {
 	struct wlr_backend backend;
@@ -17,8 +17,8 @@ struct wlr_wl_backend {
 	/* local state */
 	bool started;
 	struct wl_display *local_display;
-	list_t *devices;
-	list_t *outputs;
+	struct wl_list devices;
+	struct wl_list outputs;
 	struct wlr_egl egl;
 	size_t requested_outputs;
 	/* remote state */
@@ -51,6 +51,7 @@ struct wlr_wl_backend_output {
 	uint32_t enter_serial;
 
 	void *egl_surface;
+	struct wl_list link;
 };
 
 struct wlr_wl_input_device {
-- 
cgit v1.2.3


From 9b984253e2b878128d2042836a8c86228700b1ee Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 21 Oct 2017 14:48:58 +1300
Subject: Move egl.h to render/egl.h

---
 backend/drm/backend.c           |  2 +-
 backend/drm/renderer.c          |  2 +-
 backend/wayland/backend.c       |  2 +-
 backend/x11/backend.c           |  2 +-
 include/backend/drm/drm.h       |  2 +-
 include/backend/wayland.h       |  2 +-
 include/backend/x11.h           |  2 +-
 include/render/gles2.h          |  2 +-
 include/wlr/backend.h           |  2 +-
 include/wlr/backend/interface.h |  2 +-
 include/wlr/egl.h               | 66 -----------------------------------------
 include/wlr/render/egl.h        | 66 +++++++++++++++++++++++++++++++++++++++++
 render/egl.c                    |  2 +-
 render/gles2/renderer.c         |  2 +-
 render/gles2/texture.c          |  2 +-
 types/wlr_surface.c             |  2 +-
 16 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 include/wlr/egl.h
 create mode 100644 include/wlr/render/egl.h

(limited to 'include/backend/wayland.h')

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/egl.h
deleted file mode 100644
index 9ab4d9ce..00000000
--- a/include/wlr/egl.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef WLR_EGL_H
-#define WLR_EGL_H
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <stdbool.h>
-
-struct wlr_egl {
-	EGLDisplay display;
-	EGLConfig config;
-	EGLContext context;
-
-	const char *egl_exts;
-	const char *gl_exts;
-
-	struct wl_display *wl_display;
-};
-
-// TODO: Allocate and return a wlr_egl
-/**
- *  Initializes an egl context for the given platform and remote display.
- * Will attempt to load all possibly required api functions.
- */
-bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *display);
-
-/**
- * Frees all related egl resources, makes the context not-current and
- * unbinds a bound wayland display.
- */
-void wlr_egl_free(struct wlr_egl *egl);
-
-/**
- * Binds the given display to the egl instance.
- * This will allow clients to create egl surfaces from wayland ones and render to it.
- */
-bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
-
-/**
- * Refer to the eglQueryWaylandBufferWL extension function.
- */
-bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
-	EGLint attrib, EGLint *value);
-
-/**
- * Returns a surface for the given native window
- * The window must match the remote display the wlr_egl was created with.
- */
-EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
-
-/**
- * Creates an egl image from the given client buffer and attributes.
- */
-EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl,
-		EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
-
-/**
- * Destroys an egl image created with the given wlr_egl.
- */
-bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image);
-
-/**
- * Returns a string for the last error ocurred with egl.
- */
-const char *egl_error(void);
-
-#endif
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
new file mode 100644
index 00000000..9ab4d9ce
--- /dev/null
+++ b/include/wlr/render/egl.h
@@ -0,0 +1,66 @@
+#ifndef WLR_EGL_H
+#define WLR_EGL_H
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <stdbool.h>
+
+struct wlr_egl {
+	EGLDisplay display;
+	EGLConfig config;
+	EGLContext context;
+
+	const char *egl_exts;
+	const char *gl_exts;
+
+	struct wl_display *wl_display;
+};
+
+// TODO: Allocate and return a wlr_egl
+/**
+ *  Initializes an egl context for the given platform and remote display.
+ * Will attempt to load all possibly required api functions.
+ */
+bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *display);
+
+/**
+ * Frees all related egl resources, makes the context not-current and
+ * unbinds a bound wayland display.
+ */
+void wlr_egl_free(struct wlr_egl *egl);
+
+/**
+ * Binds the given display to the egl instance.
+ * This will allow clients to create egl surfaces from wayland ones and render to it.
+ */
+bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
+
+/**
+ * Refer to the eglQueryWaylandBufferWL extension function.
+ */
+bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
+	EGLint attrib, EGLint *value);
+
+/**
+ * Returns a surface for the given native window
+ * The window must match the remote display the wlr_egl was created with.
+ */
+EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
+
+/**
+ * Creates an egl image from the given client buffer and attributes.
+ */
+EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl,
+		EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
+
+/**
+ * Destroys an egl image created with the given wlr_egl.
+ */
+bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image);
+
+/**
+ * Returns a string for the last error ocurred with egl.
+ */
+const char *egl_error(void);
+
+#endif
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) {
-- 
cgit v1.2.3