diff options
| author | emersion <contact@emersion.fr> | 2018-05-31 12:33:27 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-05-31 12:33:27 +0100 |
| commit | 21928cbe615184a81d157ccc68e503282efff83c (patch) | |
| tree | e2523e48aadc69a109909ee37af18c76d88e4859 /include/wlr/render/wlr_texture.h | |
| parent | c844eaa1b32894417263ce2b5030033bdd7c7851 (diff) | |
| parent | 32013abae63f1c31598ac716acd7e73c24fadae1 (diff) | |
Merge branch 'master' into screencontent
Diffstat (limited to 'include/wlr/render/wlr_texture.h')
| -rw-r--r-- | include/wlr/render/wlr_texture.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/wlr/render/wlr_texture.h b/include/wlr/render/wlr_texture.h index 481b2a37..785f4fc6 100644 --- a/include/wlr/render/wlr_texture.h +++ b/include/wlr/render/wlr_texture.h @@ -5,7 +5,7 @@ #include <EGL/eglext.h> #include <stdint.h> #include <wayland-server-protocol.h> -#include <wlr/types/wlr_linux_dmabuf.h> +#include <wlr/render/dmabuf.h> struct wlr_renderer; struct wlr_texture_impl; @@ -33,7 +33,7 @@ struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer, * Create a new texture from a DMA-BUF. The returned texture is immutable. */ struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer, - struct wlr_dmabuf_buffer_attribs *attribs); + struct wlr_dmabuf_attributes *attribs); /** * Get the texture width and height. @@ -49,7 +49,7 @@ bool wlr_texture_write_pixels(struct wlr_texture *texture, const void *data); bool wlr_texture_to_dmabuf(struct wlr_texture *texture, - struct wlr_dmabuf_buffer_attribs *attribs); + struct wlr_dmabuf_attributes *attribs); /** * Destroys this wlr_texture. |