diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2021-07-23 13:39:34 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2021-07-23 13:40:14 -0400 |
| commit | f72b3cf19997425418c6d2fe93ca8df9119a3052 (patch) | |
| tree | 5c71609e7ccbaa72e0d14331e4b0951346b4c868 | |
| parent | c148ecf2cbb910f86564b0caf4240069d041de95 (diff) | |
| download | gstreamer-plugins-base-f72b3cf19997425418c6d2fe93ca8df9119a3052.tar.gz | |
Revert "glwindow: wayland: Skip redoing surfaces if window haven't changed"
This reverts commit aba6bd7822f4c0f572765bfaada76f454a594317.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1231>
| -rw-r--r-- | gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c index 621e4dba3..f2d7ceb4e 100644 --- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c +++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c @@ -614,11 +614,8 @@ gst_gl_window_wayland_egl_set_window_handle (GstGLWindow * window, GstGLWindowWaylandEGL *window_egl = GST_GL_WINDOW_WAYLAND_EGL (window); struct wl_surface *surface = (struct wl_surface *) handle; - /* Don't unparent if the window handle haven't changed or both were %NULL. - * We have to do that, since GstGLContextEGL will not recreate its - * EGLNativeWindowSurface, which will lead to crash with some Mesa driver - * version, or errors otherwise. */ - if (window_egl->window.foreign_surface == surface) + /* already set the NULL handle */ + if (surface == NULL && window_egl->window.foreign_surface == NULL) return; /* unparent */ |