brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Remove ability to bind Wayland EGL display

Browse Source 
We do that in the Wayland infrastructure code now, so remove Cogl's
ability to do the same.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1863>
This commit is contained in:
Jonas Ådahl 2021-05-06 14:49:17 +02:00 committed by Marge Bot
parent b578a534a3
commit 72f03e9c74
4 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl/cogl-display-private.h
View File

@ -44,10 +44,6 @@ struct _CoglDisplay
CoglRenderer *renderer; CoglRenderer *renderer;
CoglOnscreenTemplate *onscreen_template; CoglOnscreenTemplate *onscreen_template;
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
struct wl_display *wayland_compositor_display;
#endif
void *winsys; void *winsys;
}; };

14
cogl/cogl/cogl-display.c
View File

@ -38,9 +38,6 @@
#include "cogl-display-private.h" #include "cogl-display-private.h"
#include "cogl-renderer-private.h" #include "cogl-renderer-private.h"
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#include "cogl-wayland-server.h"
#endif
#include "cogl-gtype-private.h" #include "cogl-gtype-private.h"
#include "winsys/cogl-winsys-private.h" #include "winsys/cogl-winsys-private.h"
@ -152,14 +149,3 @@ cogl_display_setup (CoglDisplay *display,
return TRUE; return TRUE;
} }
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
void
cogl_wayland_display_set_compositor_display (CoglDisplay *display,
struct wl_display *wayland_display)
{
g_return_if_fail (display->setup == FALSE);
display->wayland_compositor_display = wayland_display;
}
#endif

6
cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
View File

@ -86,12 +86,6 @@ COGL_WINSYS_FEATURE_BEGIN (bind_wayland_display,
"WL\0", "WL\0",
"bind_wayland_display\0", "bind_wayland_display\0",
COGL_EGL_WINSYS_FEATURE_EGL_IMAGE_FROM_WAYLAND_BUFFER) COGL_EGL_WINSYS_FEATURE_EGL_IMAGE_FROM_WAYLAND_BUFFER)
COGL_WINSYS_FEATURE_FUNCTION (EGLImageKHR, eglBindWaylandDisplay,
(EGLDisplay dpy,
struct wl_display *wayland_display))
COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglUnbindWaylandDisplay,
(EGLDisplay dpy,
struct wl_display *wayland_display))
COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglQueryWaylandBuffer, COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglQueryWaylandBuffer,
(EGLDisplay dpy, (EGLDisplay dpy,
struct wl_resource *buffer, struct wl_resource *buffer,

12
cogl/cogl/winsys/cogl-winsys-egl.c
View File

@ -498,18 +498,6 @@ _cogl_winsys_display_setup (CoglDisplay *display,
egl_display = g_new0 (CoglDisplayEGL, 1); egl_display = g_new0 (CoglDisplayEGL, 1);
display->winsys = egl_display; display->winsys = egl_display;
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
if (display->wayland_compositor_display)
{
struct wl_display *wayland_display = display->wayland_compositor_display;
CoglRendererEGL *egl_renderer = display->renderer->winsys;
if (egl_renderer->pf_eglBindWaylandDisplay)
egl_renderer->pf_eglBindWaylandDisplay (egl_renderer->edpy,
wayland_display);
}
#endif
if (egl_renderer->platform_vtable->display_setup && if (egl_renderer->platform_vtable->display_setup &&
!egl_renderer->platform_vtable->display_setup (display, error)) !egl_renderer->platform_vtable->display_setup (display, error))
goto error; goto error;