From 07d75c99dba871db1ab28e70840ab55010c3314c Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 4 Jan 2021 11:16:57 +0100 Subject: render: remove EGL config and visual from wlr_renderer_autocreate This isn't used anymore by any backend. Some examples still provide an EGL config to wlr_egl_init, so we can't drop it yet there. --- render/wlr_renderer.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'render') diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index fc224467..e77c41d9 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -248,36 +248,8 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, } struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl, - EGLenum platform, void *remote_display, EGLint *config_attribs, - EGLint visual_id) { - // Append GLES2-specific bits to the provided EGL config attributes - EGLint gles2_config_attribs[] = { - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - EGL_NONE, - }; - - size_t config_attribs_len = 0; // not including terminating EGL_NONE - while (config_attribs != NULL && - config_attribs[config_attribs_len] != EGL_NONE) { - ++config_attribs_len; - } - - size_t all_config_attribs_len = config_attribs_len + - sizeof(gles2_config_attribs) / sizeof(gles2_config_attribs[0]); - EGLint all_config_attribs[all_config_attribs_len]; - if (config_attribs_len > 0) { - memcpy(all_config_attribs, config_attribs, - config_attribs_len * sizeof(EGLint)); - } - memcpy(&all_config_attribs[config_attribs_len], gles2_config_attribs, - sizeof(gles2_config_attribs)); - - if (config_attribs != NULL) { - config_attribs = all_config_attribs; - } - - if (!wlr_egl_init(egl, platform, remote_display, config_attribs, - visual_id)) { + EGLenum platform, void *remote_display) { + if (!wlr_egl_init(egl, platform, remote_display, NULL, 0)) { wlr_log(WLR_ERROR, "Could not initialize EGL"); return NULL; } -- cgit v1.2.3