From 575da2866f53d334692cfe452bc62b2d1210e2d3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 1 Jun 2022 10:47:27 -0400 Subject: [PATCH] egl/wayland: manually swap backbuffer when using zink this would usually occur through dri2_wl_swrast_commit_backbuffer(), but zink triggers this functionality using vulkan wsi, which fails to perform these updates as expected cc: mesa-stable Reviewed-by: Adam Jackson Part-of: (cherry picked from commit f67bd8adfab7eac1bd83ee5d3cc90d6dce76fbf3) --- .pick_status.json | 2 +- src/egl/drivers/dri2/platform_wayland.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index acb29d7a52c..a940e99a37f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1579,7 +1579,7 @@ "description": "egl/wayland: manually swap backbuffer when using zink", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 82726b477ec..c4332aa0633 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2546,6 +2546,10 @@ dri2_wl_swrast_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw) return _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_swap_buffers"); dri2_dpy->core->swapBuffers(dri2_surf->dri_drawable); + if (disp->Options.Zink) { + dri2_surf->current = dri2_surf->back; + dri2_surf->back = NULL; + } return EGL_TRUE; }