From 3f7e0cf5f073ef7ef88128e8661b959cc9140490 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sat, 9 Jan 2021 12:13:35 +0100 Subject: render/egl: remove surface and buffer age args from make_current These aren't used anymore. --- render/gles2/renderer.c | 8 ++++---- render/gles2/texture.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'render/gles2') diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 5474e1b6..428fcd95 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -41,7 +41,7 @@ static void destroy_buffer(struct wlr_gles2_buffer *buffer) { wl_list_remove(&buffer->link); wl_list_remove(&buffer->buffer_destroy.link); - wlr_egl_make_current(buffer->renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(buffer->renderer->egl); push_gles2_debug(buffer->renderer); @@ -575,7 +575,7 @@ static bool gles2_blit_dmabuf(struct wlr_renderer *wlr_renderer, gles2_src_tex->inverted_y = !gles2_src_tex->inverted_y; } - if (!wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL)) { + if (!wlr_egl_make_current(renderer->egl)) { goto texture_destroy_out; } @@ -673,7 +673,7 @@ struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *wlr_renderer) { static void gles2_destroy(struct wlr_renderer *wlr_renderer) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(renderer->egl); struct wlr_gles2_buffer *buffer, *buffer_tmp; wl_list_for_each_safe(buffer, buffer_tmp, &renderer->buffers, link) { @@ -861,7 +861,7 @@ extern const GLchar tex_fragment_src_rgbx[]; extern const GLchar tex_fragment_src_external[]; struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) { - if (!wlr_egl_make_current(egl, EGL_NO_SURFACE, NULL)) { + if (!wlr_egl_make_current(egl)) { return NULL; } diff --git a/render/gles2/texture.c b/render/gles2/texture.c index ea3a1161..9f886391 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -29,7 +29,7 @@ struct wlr_gles2_texture *gles2_get_texture( static struct wlr_gles2_texture *get_gles2_texture_in_context( struct wlr_texture *wlr_texture) { struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture); - wlr_egl_make_current(texture->renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(texture->renderer->egl); return texture; } @@ -138,7 +138,7 @@ struct wlr_texture *gles2_texture_from_pixels(struct wlr_renderer *wlr_renderer, uint32_t height, const void *data) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(renderer->egl); const struct wlr_gles2_pixel_format *fmt = get_gles2_format_from_wl(wl_fmt); if (fmt == NULL) { @@ -180,7 +180,7 @@ struct wlr_texture *gles2_texture_from_wl_drm(struct wlr_renderer *wlr_renderer, struct wl_resource *resource) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(renderer->egl); if (!renderer->procs.glEGLImageTargetTexture2DOES) { return NULL; @@ -245,7 +245,7 @@ struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer, struct wlr_dmabuf_attributes *attribs) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL); + wlr_egl_make_current(renderer->egl); if (!renderer->procs.glEGLImageTargetTexture2DOES) { return NULL; -- cgit v1.2.3