diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-05-30 08:39:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 08:39:45 -0400 |
| commit | 5d8e38702175fcc7cb991effeadca1f5a9308e6d (patch) | |
| tree | 9cbc288ea690b5a038ac0ad7cf198c04d992c89f /render/gles2 | |
| parent | 8c9d0f15ce416029256ebb437c99b93f34edba18 (diff) | |
| parent | 28020ff57728d07ae0715fc15696b8fe40337b3d (diff) | |
| download | wlroots-5d8e38702175fcc7cb991effeadca1f5a9308e6d.tar.xz | |
Merge pull request #1015 from emersion/dmabuf-single-modifier
Only allow one modifier per DMA-BUF, split attributes struct in render/
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 6 | ||||
| -rw-r--r-- | render/gles2/texture.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 5cea5c3b..e68bb83f 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -243,9 +243,9 @@ static int gles2_get_dmabuf_modifiers(struct wlr_renderer *wlr_renderer, } static bool gles2_check_import_dmabuf(struct wlr_renderer *wlr_renderer, - struct wlr_dmabuf_buffer *dmabuf) { + struct wlr_dmabuf_attributes *attribs) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - return wlr_egl_check_import_dmabuf(renderer->egl, dmabuf); + return wlr_egl_check_import_dmabuf(renderer->egl, attribs); } static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, @@ -299,7 +299,7 @@ static struct wlr_texture *gles2_texture_from_wl_drm( static struct wlr_texture *gles2_texture_from_dmabuf( struct wlr_renderer *wlr_renderer, - struct wlr_dmabuf_buffer_attribs *attribs) { + struct wlr_dmabuf_attributes *attribs) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); return wlr_gles2_texture_from_dmabuf(renderer->egl, attribs); } diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 37424802..2627e292 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -199,7 +199,7 @@ struct wlr_texture *wlr_gles2_texture_from_wl_drm(struct wlr_egl *egl, } struct wlr_texture *wlr_gles2_texture_from_dmabuf(struct wlr_egl *egl, - struct wlr_dmabuf_buffer_attribs *attribs) { + struct wlr_dmabuf_attributes *attribs) { assert(wlr_egl_is_current(egl)); if (!glEGLImageTargetTexture2DOES) { @@ -225,7 +225,7 @@ struct wlr_texture *wlr_gles2_texture_from_dmabuf(struct wlr_egl *egl, texture->type = WLR_GLES2_TEXTURE_DMABUF; texture->has_alpha = true; texture->inverted_y = - (attribs->flags & WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_Y_INVERT) != 0; + (attribs->flags & WLR_DMABUF_ATTRIBUTES_FLAGS_Y_INVERT) != 0; texture->image = wlr_egl_create_image_from_dmabuf(egl, attribs); if (texture->image == NULL) { |