mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-06 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/xdg-popup

Browse source
This commit is contained in:
Tony Crisci 2017-10-06 07:04:27 -04:00
commit 4657f10dd2
20 changed files with 374 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/drm/backend.c
View file

@ -34,8 +34,8 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
wlr_output_destroy(&conn->output);
}
wlr_drm_renderer_finish(&drm->renderer);
wlr_drm_resources_free(drm);
wlr_drm_renderer_finish(&drm->renderer);
wlr_session_close_file(drm->session, drm->fd);
wl_event_source_remove(drm->drm_event);
list_free(drm->outputs);

13
backend/drm/drm.c
View file

@ -169,6 +169,19 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
drmModeDestroyPropertyBlob(drm->fd, crtc->mode_id);
}
}
for (size_t i = 0; i < drm->num_planes; ++i) {
struct wlr_drm_plane *plane = &drm->planes[i];
if (plane->cursor_bo) {
gbm_bo_destroy(plane->cursor_bo);
}
if (plane->wlr_tex) {
wlr_texture_destroy(plane->wlr_tex);
}
if (plane->wlr_rend) {
wlr_renderer_destroy(plane->wlr_rend);
}
}
free(drm->crtcs);
free(drm->planes);
}