Experimental wayland support, test 1

2026-05-06 23:06:22 +09:00 · 2023-07-17 22:27:14 +02:00
parent 93225fbc3b
commit 0a2806972f
24 changed files with 1438 additions and 146 deletions
--- a/src/egl.c
+++ b/src/egl.c
@@ -3,35 +3,209 @@
 #include <string.h>
 #include <stdio.h>
 #include <dlfcn.h>
+#include <assert.h>

-static bool gsr_egl_create_window(gsr_egl *self) {
+#include <wayland-client.h>
+#include <wayland-egl.h>
+//#include "../external/wlr-export-dmabuf-unstable-v1-client-protocol.h"
+#include <unistd.h>
+
+#if 0
+static struct wl_compositor *compositor = NULL;
+static struct wl_output *output = NULL;
+static struct zwlr_export_dmabuf_manager_v1 *export_manager = NULL;
+static struct zwlr_export_dmabuf_frame_v1 *current_frame = NULL;
+//static struct wl_shell *shell = NULL;
+
+struct window {
+	EGLContext egl_context;
+	struct wl_surface *surface;
+	//struct wl_shell_surface *shell_surface;
+	struct wl_egl_window *egl_window;
+	EGLSurface egl_surface;
+};
+
+static void output_handle_geometry(void *data, struct wl_output *wl_output,
+		int32_t x, int32_t y, int32_t phys_width, int32_t phys_height,
+		int32_t subpixel, const char *make, const char *model,
+		int32_t transform) {
+	fprintf(stderr, "output geometry, make: %s, model: %s\n", make, model);
+}
+
+static void output_handle_mode(void *data, struct wl_output *wl_output,
+		uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
+	
+}
+
+static void output_handle_done(void* data, struct wl_output *wl_output) {
+	/* Nothing to do */
+}
+
+static void output_handle_scale(void* data, struct wl_output *wl_output,
+		int32_t factor) {
+	/* Nothing to do */
+}
+
+static const struct wl_output_listener output_listener = {
+	.geometry = output_handle_geometry,
+	.mode = output_handle_mode,
+	.done = output_handle_done,
+	.scale = output_handle_scale,
+};
+#endif
+
+static void registry_add_object (void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
+    (void)version;
+    struct wl_compositor **wayland_compositor = data;
+	if (strcmp(interface, "wl_compositor") == 0) {
+        if(*wayland_compositor) {
+            wl_compositor_destroy(*wayland_compositor);
+            *wayland_compositor = NULL;
+        }
+		*wayland_compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 1);
+    }/* else if(strcmp(interface, wl_output_interface.name) == 0) {
+        fprintf(stderr, "wayland output, name: %u\n", name);
+        output = wl_registry_bind(registry, name, &wl_output_interface, 1);
+        wl_output_add_listener(output, &output_listener, NULL);
+	} else if(strcmp(interface, zwlr_export_dmabuf_manager_v1_interface.name) == 0) {
+        export_manager = wl_registry_bind(registry, name, &zwlr_export_dmabuf_manager_v1_interface, 1);
+    }*/
+    //fprintf(stderr, "interface: %s\n", interface);
+}
+
+static void registry_remove_object (void *data, struct wl_registry *registry, uint32_t name) {
+	(void)data;
+    (void)registry;
+    (void)name;
+}
+
+static struct wl_registry_listener registry_listener = {&registry_add_object, &registry_remove_object};
+
+#if 0
+static void register_cb(gsr_egl *egl);
+
+static void frame_start(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
+		uint32_t width, uint32_t height, uint32_t offset_x, uint32_t offset_y,
+		uint32_t buffer_flags, uint32_t flags, uint32_t format,
+		uint32_t mod_high, uint32_t mod_low, uint32_t num_objects) {
+    gsr_egl *egl = data;
+	//fprintf(stderr, "frame start, width: %u, height: %u, offset x: %u, offset y: %u, format: %u, num objects: %u\n", width, height, offset_x, offset_y, format, num_objects);
+    egl->width = width;
+    egl->height = height;
+    egl->pixel_format = format;
+    egl->modifier = ((uint64_t)mod_high << 32) | mod_low;
+    current_frame = frame;
+}
+
+static void frame_object(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
+		uint32_t index, int32_t fd, uint32_t size, uint32_t offset,
+		uint32_t stride, uint32_t plane_index) {
+    // TODO: What if we get multiple objects? then we get multiple fd per frame
+    gsr_egl *egl = data;
+    //egl->fd = fd;
+    egl->pitch = stride;
+    egl->offset = offset;
+	//fprintf(stderr, "new frame, fd: %d, index: %u, size: %u, offset: %u, stride: %u, plane_index: %u\n", fd, index, size, offset, stride, plane_index);
+    close(fd);
+}
+
+
+static void frame_ready(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
+		uint32_t tv_sec_hi, uint32_t tv_sec_lo, uint32_t tv_nsec) {
+	register_cb(data);
+}
+
+static void frame_cancel(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
+		uint32_t reason) {
+    register_cb(data);
+}
+
+
+static const struct zwlr_export_dmabuf_frame_v1_listener frame_listener = {
+	.frame = frame_start,
+	.object = frame_object,
+	.ready = frame_ready,
+	.cancel = frame_cancel,
+};
+
+static struct zwlr_export_dmabuf_frame_v1 *frame_callback = NULL;
+static void register_cb(gsr_egl *egl) {
+    bool with_cursor = false;
+    frame_callback = zwlr_export_dmabuf_manager_v1_capture_output(export_manager, with_cursor, output);
+    zwlr_export_dmabuf_frame_v1_add_listener(frame_callback, &frame_listener, egl);
+}
+#endif
+
+// TODO: Create egl context without surface (in other words, x11/wayland agnostic, doesn't require x11/wayland dependency)
+static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
    EGLConfig  ecfg;
    int32_t    num_config = 0;
+
    EGLDisplay egl_display = NULL;
    EGLSurface egl_surface = NULL;
    EGLContext egl_context = NULL;
-    Window window = None;
-    
-    int32_t attr[] = {
+
+    Window x11_window = None;
+
+    struct wl_registry *wayland_registry = NULL;
+    struct wl_compositor *wayland_compositor = NULL;
+    struct wl_surface *wayland_surface = NULL;
+    void *wayland_dpy = NULL;
+    void *wayland_window = NULL;
+
+    const int32_t attr[] = {
        EGL_BUFFER_SIZE, 24,
-        EGL_RENDERABLE_TYPE,
-        EGL_OPENGL_ES2_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
        EGL_NONE
    };

-    int32_t ctxattr[] = {
+    const int32_t ctxattr[] = {
        EGL_CONTEXT_CLIENT_VERSION, 2,
        EGL_NONE
    };

-    window = XCreateWindow(self->dpy, DefaultRootWindow(self->dpy), 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
+    if(wayland) {
+        wayland_dpy = wl_display_connect(NULL);
+        if(!wayland_dpy) {
+            fprintf(stderr, "gsr error: gsr_egl_create_window failed: wl_display_connect failed\n");
+            goto fail;
+        }

-    if(!window) {
-        fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to create gl window\n");
-        goto fail;
+        wayland_registry = wl_display_get_registry(wayland_dpy); // TODO: Error checking
+        wl_registry_add_listener(wayland_registry, &registry_listener, &wayland_compositor); // TODO: Error checking
+
+        // Fetch globals
+        wl_display_roundtrip(wayland_dpy);
+
+        // fetch wl_output
+        wl_display_roundtrip(wayland_dpy);
+
+        if(!wayland_compositor) {
+            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to find compositor\n");
+            goto fail;
+        }
+
+        /*if(!output) {
+            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to find output\n");
+            goto fail;
+        }
+
+        if(!export_manager) {
+            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to find export manager\n");
+            goto fail;
+        }*/
+    } else {
+        x11_window = XCreateWindow(self->x11_dpy, DefaultRootWindow(self->x11_dpy), 0, 0, 16, 16, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
+
+        if(!x11_window) {
+            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to create gl window\n");
+            goto fail;
+        }
    }

-    egl_display = self->eglGetDisplay(self->dpy);
+    self->eglBindAPI(EGL_OPENGL_ES_API);
+
+    egl_display = self->eglGetDisplay(wayland_dpy ? (EGLNativeDisplayType)wayland_dpy : (EGLNativeDisplayType)self->x11_dpy);
    if(!egl_display) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: eglGetDisplay failed\n");
        goto fail;
@@ -47,18 +221,25 @@ static bool gsr_egl_create_window(gsr_egl *self) {
        goto fail;
    }
    
-    egl_surface = self->eglCreateWindowSurface(egl_display, ecfg, (EGLNativeWindowType)window, NULL);
-    if(!egl_surface) {
-        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create window surface\n");
-        goto fail;
-    }
-    
    egl_context = self->eglCreateContext(egl_display, ecfg, NULL, ctxattr);
    if(!egl_context) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create egl context\n");
        goto fail;
    }

+    if(wayland) {
+        wayland_surface = wl_compositor_create_surface(wayland_compositor);
+        wayland_window = wl_egl_window_create(wayland_surface, 16, 16);
+        egl_surface = self->eglCreateWindowSurface(egl_display, ecfg, (EGLNativeWindowType)wayland_window, NULL);
+    } else {
+        egl_surface = self->eglCreateWindowSurface(egl_display, ecfg, (EGLNativeWindowType)x11_window, NULL);
+    }
+
+    if(!egl_surface) {
+        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create window surface\n");
+        goto fail;
+    }
+
    if(!self->eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context)) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to make context current\n");
        goto fail;
@@ -67,7 +248,14 @@ static bool gsr_egl_create_window(gsr_egl *self) {
    self->egl_display = egl_display;
    self->egl_surface = egl_surface;
    self->egl_context = egl_context;
-    self->window = window;
+
+    self->x11_window = x11_window;
+
+    self->wayland_dpy = wayland_dpy;
+    self->wayland_window = wayland_window;
+    self->wayland_surface = wayland_surface;
+    self->wayland_compositor = wayland_compositor;
+    self->wayland_registry = wayland_registry;
    return true;

    fail:
@@ -77,8 +265,18 @@ static bool gsr_egl_create_window(gsr_egl *self) {
        self->eglDestroySurface(egl_display, egl_surface);
    if(egl_display)
        self->eglTerminate(egl_display);
-    if(window)
-        XDestroyWindow(self->dpy, window);
+    if(x11_window)
+        XDestroyWindow(self->x11_dpy, x11_window);
+    if(wayland_window)
+        wl_egl_window_destroy(wayland_window);
+    if(wayland_surface)
+        wl_surface_destroy(wayland_surface);
+    if(wayland_compositor)
+        wl_compositor_destroy(wayland_compositor);
+    if(wayland_registry)
+        wl_registry_destroy(wayland_registry);
+    if(wayland_dpy)
+        wl_display_disconnect(wayland_dpy);
    return false;
 }

@@ -98,6 +296,7 @@ static bool gsr_egl_load_egl(gsr_egl *self, void *library) {
        { (void**)&self->eglDestroyImage, "eglDestroyImage" },
        { (void**)&self->eglSwapInterval, "eglSwapInterval" },
        { (void**)&self->eglSwapBuffers, "eglSwapBuffers" },
+        { (void**)&self->eglBindAPI, "eglBindAPI" },
        { (void**)&self->eglGetProcAddress, "eglGetProcAddress" },

        { NULL, NULL }
@@ -186,9 +385,9 @@ static bool gsr_egl_load_gl(gsr_egl *self, void *library) {
    return true;
 }

-bool gsr_egl_load(gsr_egl *self, Display *dpy) {
+bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland) {
    memset(self, 0, sizeof(gsr_egl));
-    self->dpy = dpy;
+    self->x11_dpy = dpy;

    void *egl_lib = NULL;
    void *gl_lib = NULL;
@@ -215,7 +414,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy) {
    if(!gsr_egl_proc_load_egl(self))
        goto fail;

-    if(!gsr_egl_create_window(self))
+    if(!gsr_egl_create_window(self, wayland))
        goto fail;

    self->glEnable(GL_BLEND);
@@ -250,9 +449,34 @@ void gsr_egl_unload(gsr_egl *self) {
        self->egl_display = NULL;
    }

-    if(self->window) {
-        XDestroyWindow(self->dpy, self->window);
-        self->window = None;
+    if(self->x11_window) {
+        XDestroyWindow(self->x11_dpy, self->x11_window);
+        self->x11_window = None;
+    }
+
+    if(self->wayland_window) {
+        wl_egl_window_destroy(self->wayland_window);
+        self->wayland_window = NULL;
+    }
+
+    if(self->wayland_surface) {
+        wl_surface_destroy(self->wayland_surface);
+        self->wayland_surface = NULL;
+    }
+
+    if(self->wayland_compositor) {
+        wl_compositor_destroy(self->wayland_compositor);
+        self->wayland_compositor = NULL;
+    }
+
+    if(self->wayland_registry) {
+        wl_registry_destroy(self->wayland_registry);
+        self->wayland_registry = NULL;
+    }
+
+    if(self->wayland_dpy) {
+        wl_display_disconnect(self->wayland_dpy);
+        self->wayland_dpy = NULL;
    }

    if(self->egl_library) {
@@ -267,3 +491,25 @@ void gsr_egl_unload(gsr_egl *self) {

    memset(self, 0, sizeof(gsr_egl));
 }
+
+void gsr_egl_update(gsr_egl *self) {
+    if(!self->wayland_dpy)
+        return;
+
+    wl_display_dispatch(self->wayland_dpy);
+}
+
+void gsr_egl_cleanup_frame(gsr_egl *self) {
+    if(!self->wayland_dpy)
+        return;
+
+    if(self->fd > 0) {
+        close(self->fd);
+        self->fd = 0;
+    }
+
+    /*if(current_frame) {
+        zwlr_export_dmabuf_frame_v1_destroy(current_frame);
+        current_frame = NULL;
+    }*/
+}