diff options
Diffstat (limited to '0008-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch')
-rw-r--r-- | 0008-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/0008-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch b/0008-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch deleted file mode 100644 index e75238640d8c..000000000000 --- a/0008-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch +++ /dev/null @@ -1,159 +0,0 @@ -From a49fdfc86296f3e6a05388c7bc7ea806be49d919 Mon Sep 17 00:00:00 2001 -From: "Miguel A. Vico" <mvicomoya@nvidia.com> -Date: Mon, 27 Feb 2017 15:31:35 -0800 -Subject: [PATCH 08/10] simple-egl: Do not set EGL up until XDG setup is - complete -X-NVConfidentiality: public - -There is nothing that prohibits the underlying EGL_PLATFORM_WAYLAND -implementation to attach a buffer or commit surfaces right after the -Wayland EGLSurface has been created. - -Since XDG Shell v6 imposes that no buffer attachments or surface commits -must be done before a configure is complete, Wayland clients shouldn't -start setting EGL up until XDG setup is complete. - -Related bug: - - https://bugs.freedesktop.org/show_bug.cgi?id=98731 - -Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com> ---- - clients/simple-egl.c | 64 +++++++++++++++++++++++--------------------- - 1 file changed, 33 insertions(+), 31 deletions(-) - -diff --git a/clients/simple-egl.c b/clients/simple-egl.c -index 8a086ef0..2d409c70 100644 ---- a/clients/simple-egl.c -+++ b/clients/simple-egl.c -@@ -217,11 +217,32 @@ init_egl(struct display *display, struct window *window) - if (display->swap_buffers_with_damage) - printf("has EGL_EXT_buffer_age and %s\n", swap_damage_ext_to_entrypoint[i].extension); - -+ window->egl_surface = -+ weston_platform_create_egl_surface(display->egl.dpy, -+ display->egl.conf, -+ window->native, NULL); -+ -+ ret = eglMakeCurrent(window->display->egl.dpy, window->egl_surface, -+ window->egl_surface, window->display->egl.ctx); -+ assert(ret == EGL_TRUE); -+ -+ if (!window->frame_sync) -+ eglSwapInterval(display->egl.dpy, 0); -+ - } - - static void --fini_egl(struct display *display) -+fini_egl(struct display *display, struct window *window) - { -+ /* Required, otherwise segfault in egl_dri2.c: dri2_make_current() -+ * on eglReleaseThread(). */ -+ eglMakeCurrent(window->display->egl.dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, -+ EGL_NO_CONTEXT); -+ -+ weston_platform_destroy_egl_surface(window->display->egl.dpy, -+ window->egl_surface); -+ wl_egl_window_destroy(window->native); -+ - eglTerminate(display->egl.dpy); - eglReleaseThread(); - } -@@ -358,7 +379,6 @@ static void - create_surface(struct window *window) - { - struct display *display = window->display; -- EGLBoolean ret; - - window->surface = wl_compositor_create_surface(display->compositor); - -@@ -366,10 +386,6 @@ create_surface(struct window *window) - wl_egl_window_create(window->surface, - window->geometry.width, - window->geometry.height); -- window->egl_surface = -- weston_platform_create_egl_surface(display->egl.dpy, -- display->egl.conf, -- window->native, NULL); - - window->xdg_surface = xdg_wm_base_get_xdg_surface(display->wm_base, - window->surface); -@@ -386,13 +402,6 @@ create_surface(struct window *window) - window->wait_for_configure = true; - wl_surface_commit(window->surface); - -- ret = eglMakeCurrent(window->display->egl.dpy, window->egl_surface, -- window->egl_surface, window->display->egl.ctx); -- assert(ret == EGL_TRUE); -- -- if (!window->frame_sync) -- eglSwapInterval(display->egl.dpy, 0); -- - if (!display->wm_base) - return; - -@@ -403,15 +412,6 @@ create_surface(struct window *window) - static void - destroy_surface(struct window *window) - { -- /* Required, otherwise segfault in egl_dri2.c: dri2_make_current() -- * on eglReleaseThread(). */ -- eglMakeCurrent(window->display->egl.dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, -- EGL_NO_CONTEXT); -- -- weston_platform_destroy_egl_surface(window->display->egl.dpy, -- window->egl_surface); -- wl_egl_window_destroy(window->native); -- - if (window->xdg_toplevel) - xdg_toplevel_destroy(window->xdg_toplevel); - if (window->xdg_surface) -@@ -846,9 +846,7 @@ main(int argc, char **argv) - - wl_display_roundtrip(display.display); - -- init_egl(&display, &window); - create_surface(&window); -- init_gl(&window); - - display.cursor_surface = - wl_compositor_create_surface(display.compositor); -@@ -858,23 +856,27 @@ main(int argc, char **argv) - sigint.sa_flags = SA_RESETHAND; - sigaction(SIGINT, &sigint, NULL); - -+ /* We must assure XDG setup is complete before setting EGL up */ -+ while (running && window.wait_for_configure) { -+ wl_display_dispatch(display.display); -+ } -+ -+ init_egl(&display, &window); -+ init_gl(&window); -+ - /* The mainloop here is a little subtle. Redrawing will cause - * EGL to read events so we can just call - * wl_display_dispatch_pending() to handle any events that got - * queued up as a side effect. */ - while (running && ret != -1) { -- if (window.wait_for_configure) { -- wl_display_dispatch(display.display); -- } else { -- wl_display_dispatch_pending(display.display); -- redraw(&window, NULL, 0); -- } -+ wl_display_dispatch_pending(display.display); -+ redraw(&window, NULL, 0); - } - - fprintf(stderr, "simple-egl exiting\n"); - -+ fini_egl(&display, &window); - destroy_surface(&window); -- fini_egl(&display); - - wl_surface_destroy(display.cursor_surface); - if (display.cursor_theme) --- -2.21.0 - |