diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-30 03:32:05 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-30 03:32:05 +0000 |
| commit | 224c2674abc716397b1a45aad31608f3bf6cdd78 (patch) | |
| tree | 098d3fbe12a9bcbcd718e28bce2e9dc3d4bb2c67 | |
| parent | 5fe433418d271acf06afc1538c3289b9e2ad4478 (diff) | |
| parent | 3344bcaf92bf1659bd3db0a896edd01dcd3005f3 (diff) | |
| download | gtk+-224c2674abc716397b1a45aad31608f3bf6cdd78.tar.gz | |
Merge branch 'gtk_egl_wayland' into 'master'
Expose gdk_wayland_surface_get_wl_egl_window()
See merge request GNOME/gtk!3011
| -rw-r--r-- | gdk/wayland/gdksurface-wayland.c | 2 | ||||
| -rw-r--r-- | gdk/wayland/gdkwaylandsurface.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index dd0d1891fa..296acdf2bb 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -4209,7 +4209,7 @@ gdk_wayland_surface_get_wl_output (GdkSurface *surface) return NULL; } -static struct wl_egl_window * +struct wl_egl_window * gdk_wayland_surface_get_wl_egl_window (GdkSurface *surface) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h index 851a4d5607..180903ff7c 100644 --- a/gdk/wayland/gdkwaylandsurface.h +++ b/gdk/wayland/gdkwaylandsurface.h @@ -62,6 +62,9 @@ GType gdk_wayland_popup_get_type (void); GDK_AVAILABLE_IN_ALL struct wl_surface *gdk_wayland_surface_get_wl_surface (GdkSurface *surface); +GDK_AVAILABLE_IN_ALL +struct wl_egl_window *gdk_wayland_surface_get_wl_egl_window (GdkSurface *surface); + typedef void (*GdkWaylandToplevelExported) (GdkToplevel *toplevel, const char *handle, gpointer user_data); |