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 /render/gles2 | |
| parent | c844eaa1b32894417263ce2b5030033bdd7c7851 (diff) | |
| parent | 32013abae63f1c31598ac716acd7e73c24fadae1 (diff) | |
Merge branch 'master' into screencontent
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 8 | ||||
| -rw-r--r-- | render/gles2/texture.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 5cea5c3b..00a5c285 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -84,7 +84,7 @@ static void gles2_scissor(struct wlr_renderer *wlr_renderer, POP_GLES2_DEBUG; } -static void draw_quad() { +static void draw_quad(void) { GLfloat verts[] = { 1, 0, // top right 0, 0, // top left @@ -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 742f9da0..0f061f59 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -75,7 +75,7 @@ static bool gles2_texture_write_pixels(struct wlr_texture *wlr_texture, } static bool gles2_texture_to_dmabuf(struct wlr_texture *wlr_texture, - struct wlr_dmabuf_buffer_attribs *attribs) { + struct wlr_dmabuf_attributes *attribs) { struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture); if (!texture->image) { @@ -95,7 +95,7 @@ static bool gles2_texture_to_dmabuf(struct wlr_texture *wlr_texture, uint32_t flags = 0; if (texture->inverted_y) { - flags |= WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_Y_INVERT; + flags |= WLR_DMABUF_ATTRIBUTES_FLAGS_Y_INVERT; } return wlr_egl_export_image_to_dmabuf(texture->egl, texture->image, @@ -228,7 +228,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) { @@ -254,7 +254,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) { |