mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-15 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into screencontent

Browse source
This commit is contained in:
emersion 2018-05-31 12:33:27 +01:00
commit 21928cbe61
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
39 changed files with 163 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

4
render/wlr_texture.c
View file

@ -35,7 +35,7 @@ struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer,
}
struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer,
struct wlr_dmabuf_buffer_attribs *attribs) {
struct wlr_dmabuf_attributes *attribs) {
if (!renderer->impl->texture_from_dmabuf) {
return NULL;
}
@ -56,7 +56,7 @@ bool wlr_texture_write_pixels(struct wlr_texture *texture,
}
bool wlr_texture_to_dmabuf(struct wlr_texture *texture,
struct wlr_dmabuf_buffer_attribs *attribs) {
struct wlr_dmabuf_attributes *attribs) {
if (!texture->impl->to_dmabuf) {
return false;
}