mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-30 11:11:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into 10bit-color

Browse source
This commit is contained in:
DerVerruckteFuchs 2020-07-19 22:39:11 -04:00
commit e9855a3571
14 changed files with 505 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/drm/drm.c
View file

@ -935,7 +935,9 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
return false;
}
drm_surface_make_current(&plane->surf, NULL);
if (!drm_surface_make_current(&plane->surf, NULL)) {
return false;
}
struct wlr_renderer *rend = plane->surf.renderer->wlr_rend;

4
backend/drm/renderer.c
View file

@ -127,8 +127,8 @@ static void finish_drm_surface(struct wlr_drm_surface *surf) {
}
bool drm_surface_make_current(struct wlr_drm_surface *surf,
int *buffer_damage) {
return wlr_egl_make_current(&surf->renderer->egl, surf->egl, buffer_damage);
int *buffer_age) {
return wlr_egl_make_current(&surf->renderer->egl, surf->egl, buffer_age);
}
bool export_drm_bo(struct gbm_bo *bo, struct wlr_dmabuf_attributes *attribs) {