[gtk/revert-224c2674] Revert "Merge branch 'gtk_egl_wayland' into 'master'"




commit b5fe434feaded498c2fd614688fb4ccc0671d09d
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Dec 30 03:32:18 2020 +0000

    Revert "Merge branch 'gtk_egl_wayland' into 'master'"
    
    This reverts merge request !3011

 gdk/wayland/gdksurface-wayland.c | 2 +-
 gdk/wayland/gdkwaylandsurface.h  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 296acdf2bb..dd0d1891fa 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;
 }
 
-struct wl_egl_window *
+static 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 180903ff7c..851a4d5607 100644
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -62,9 +62,6 @@ 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]