Mesa (main): wsi/x11: cleanup properly after mit shm paths are used.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7d388c8d096569d1ce28bf1c8318a0f374debe8d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d388c8d096569d1ce28bf1c8318a0f374debe8d

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Oct  6 17:23:39 2021 +1000

wsi/x11: cleanup properly after mit shm paths are used.

This path was being skipped on sw + has_mit_shm, when it
shouldn't be.

Fixes: a069b4e9b9a1 ("vulkan/wsi/sw: add mit-shm support for pixmap allocation")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13217>

---

 src/vulkan/wsi/wsi_common_x11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 278d9ace085..f704efbc733 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1512,7 +1512,7 @@ x11_image_finish(struct x11_swapchain *chain,
 {
    xcb_void_cookie_t cookie;
 
-   if (!chain->base.wsi->sw) {
+   if (!chain->base.wsi->sw || chain->has_mit_shm) {
       cookie = xcb_sync_destroy_fence(chain->conn, image->sync_fence);
       xcb_discard_reply(chain->conn, cookie.sequence);
       xshmfence_unmap_shm(image->shm_fence);