summaryrefslogtreecommitdiff
path: root/media-libs/mesa/files
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/mesa/files')
-rw-r--r--media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch49
-rw-r--r--media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch37
2 files changed, 0 insertions, 86 deletions
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
deleted file mode 100644
index 5992583a1fa0..000000000000
--- a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/904072
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
-
-From 689ce66a4332524b4eb98877de6f75d05dd05c60 Mon Sep 17 00:00:00 2001
-From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Date: Thu, 2 Mar 2023 10:10:42 +0200
-Subject: [PATCH] vulkan/wsi/wayland: Fix destruction of event queue with
- proxies still attached.
-
-Destroy the surface dmabuf feedback proxy before destroying the event
-queue that the proxy is attached to.
-
-This silences a warning that libwayland 1.22 emits for programs that use
-Vulkan/Wayland:
-
-warning: queue 0x557a4efbcf70 destroyed while proxies still attached:
- zwp_linux_dmabuf_feedback_v1@18 still attached
-
-Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
---- a/src/vulkan/wsi/wsi_common_wayland.c
-+++ b/src/vulkan/wsi/wsi_common_wayland.c
-@@ -1157,18 +1157,18 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
- struct wsi_wl_surface *wsi_wl_surface =
- wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
-
-- if (wsi_wl_surface->surface)
-- wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
--
-- if (wsi_wl_surface->display)
-- wsi_wl_display_destroy(wsi_wl_surface->display);
--
- if (wsi_wl_surface->wl_dmabuf_feedback) {
- zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
- dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
- dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
- }
-
-+ if (wsi_wl_surface->surface)
-+ wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
-+
-+ if (wsi_wl_surface->display)
-+ wsi_wl_display_destroy(wsi_wl_surface->display);
-+
- vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
- }
-
---
-GitLab
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
deleted file mode 100644
index 537d070c091e..000000000000
--- a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/904072
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
-
-From ee5d2250fd159689aae3f7d632a6226971bea85c Mon Sep 17 00:00:00 2001
-From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Date: Thu, 2 Mar 2023 09:35:08 +0200
-Subject: [PATCH] egl/wayland: Fix destruction of event queue with proxies
- still attached.
-
-Destroy the display wrapper proxy before destroying the event queue that
-the proxy is attached to.
-
-This silences a warning that libwayland 1.22 emits for programs that use
-EGL/Wayland:
-
-warning: queue 0x562a5ed2cd20 destroyed while proxies still attached:
- wl_display@1 still attached
-
-Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646>
---- a/src/egl/drivers/dri2/platform_wayland.c
-+++ b/src/egl/drivers/dri2/platform_wayland.c
-@@ -2865,10 +2865,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
- wl_shm_destroy(dri2_dpy->wl_shm);
- if (dri2_dpy->wl_registry)
- wl_registry_destroy(dri2_dpy->wl_registry);
-- if (dri2_dpy->wl_queue)
-- wl_event_queue_destroy(dri2_dpy->wl_queue);
- if (dri2_dpy->wl_dpy_wrapper)
- wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
-+ if (dri2_dpy->wl_queue)
-+ wl_event_queue_destroy(dri2_dpy->wl_queue);
-
- if (dri2_dpy->own_device)
- wl_display_disconnect(dri2_dpy->wl_dpy);
---
-GitLab