mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor: access correct weston_buffer union field according to type 

Stop writing weston_buffer::shm_buffer when weston_buffer::type is not
WESTON_BUFFER_SHM. Instead, explicitly write to the union field
that corresponds to the buffer type.
Also add a comment why we clear the shm_buffer/dmabuf/legacy_buffer
pointer here.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2024-06-18 18:43:09 +02:00 committed by Marius Vlad
parent c3321d5819
commit 060f010c35
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libweston/compositor.c
View File

@ -2761,7 +2761,21 @@ weston_buffer_destroy_handler(struct wl_listener *listener, void *data)
container_of(listener, struct weston_buffer, destroy_listener);
buffer->resource = NULL;
buffer->shm_buffer = NULL;
/* wayland-server will destroy the SHM/dmabuf/legacy wl_buffer after we
* return. */
switch (buffer->type) {
case WESTON_BUFFER_SHM:
buffer->shm_buffer = NULL;
break;
case WESTON_BUFFER_DMABUF:
buffer->dmabuf = NULL;
break;
case WESTON_BUFFER_SOLID:
break;
case WESTON_BUFFER_RENDERER_OPAQUE:
buffer->legacy_buffer = NULL;
break;
}
if (buffer->busy_count + buffer->passive_count > 0)
return;