Added
Link Here
|
1 |
https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee5d2250fd15 |
2 |
https://gitlab.freedesktop.org/mesa/mesa/-/commit/689ce66a4332 |
3 |
|
4 |
--- src/egl/drivers/dri2/platform_wayland.c.orig 2023-03-08 18:37:09 UTC |
5 |
+++ src/egl/drivers/dri2/platform_wayland.c |
6 |
@@ -2789,10 +2789,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dp |
7 |
wl_shm_destroy(dri2_dpy->wl_shm); |
8 |
if (dri2_dpy->wl_registry) |
9 |
wl_registry_destroy(dri2_dpy->wl_registry); |
10 |
- if (dri2_dpy->wl_queue) |
11 |
- wl_event_queue_destroy(dri2_dpy->wl_queue); |
12 |
if (dri2_dpy->wl_dpy_wrapper) |
13 |
wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper); |
14 |
+ if (dri2_dpy->wl_queue) |
15 |
+ wl_event_queue_destroy(dri2_dpy->wl_queue); |
16 |
|
17 |
if (dri2_dpy->own_device) |
18 |
wl_display_disconnect(dri2_dpy->wl_dpy); |
19 |
--- src/vulkan/wsi/wsi_common_wayland.c.orig 2023-03-08 18:37:09 UTC |
20 |
+++ src/vulkan/wsi/wsi_common_wayland.c |
21 |
@@ -1156,17 +1156,17 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, |
22 |
struct wsi_wl_surface *wsi_wl_surface = |
23 |
wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base); |
24 |
|
25 |
- if (wsi_wl_surface->surface) |
26 |
- wl_proxy_wrapper_destroy(wsi_wl_surface->surface); |
27 |
- |
28 |
- if (wsi_wl_surface->display) |
29 |
- wsi_wl_display_destroy(wsi_wl_surface->display); |
30 |
- |
31 |
if (wsi_wl_surface->wl_dmabuf_feedback) { |
32 |
zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback); |
33 |
dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback); |
34 |
dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback); |
35 |
} |
36 |
+ |
37 |
+ if (wsi_wl_surface->surface) |
38 |
+ wl_proxy_wrapper_destroy(wsi_wl_surface->surface); |
39 |
+ |
40 |
+ if (wsi_wl_surface->display) |
41 |
+ wsi_wl_display_destroy(wsi_wl_surface->display); |
42 |
|
43 |
vk_free2(&instance->alloc, pAllocator, wsi_wl_surface); |
44 |
} |