Merge branch 'master' into matrix-redesign

This commit is contained in:
emersion 2018-03-15 15:48:09 +01:00
commit 8b58e1a3ad
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
16 changed files with 809 additions and 8 deletions

View file

@ -53,6 +53,11 @@ bool wlr_texture_upload_eglimage(struct wlr_texture *texture,
return texture->impl->upload_eglimage(texture, image, width, height);
}
bool wlr_texture_upload_dmabuf(struct wlr_texture *texture,
struct wl_resource *dmabuf_resource) {
return texture->impl->upload_dmabuf(texture, dmabuf_resource);
}
void wlr_texture_get_matrix(struct wlr_texture *texture,
float mat[static 9], const float projection[static 9], int x, int y) {
texture->impl->get_matrix(texture, mat, projection, x, y);