Refactor wlr_egl_init to accept config_attribs

4 files changed, 20 insertions, 98 deletions

diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 8a8d7d1f..00182c59 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -24,8 +24,8 @@ bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
 		return false;
 	}
 
-	if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA,
-			GBM_FORMAT_ARGB8888, renderer->gbm)) {
+	if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, renderer->gbm,
+			NULL, GBM_FORMAT_ARGB8888)) {
 		goto error_gbm;
 	}
 
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 71c87dd0..f95e3897 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -73,98 +73,6 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
 	backend_destroy(&backend->backend);
 }
 
-static bool egl_get_config(EGLDisplay disp, EGLConfig *out) {
-	EGLint count = 0, matched = 0, ret;
-
-	ret = eglGetConfigs(disp, NULL, 0, &count);
-	if (ret == EGL_FALSE || count == 0) {
-		wlr_log(L_ERROR, "eglGetConfigs returned no configs");
-		return false;
-	}
-
-	EGLConfig configs[count];
-
-	static const EGLint attribs[] = {
-		EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
-		EGL_ALPHA_SIZE, 0,
-		EGL_BLUE_SIZE, 8,
-		EGL_GREEN_SIZE, 8,
-		EGL_RED_SIZE, 8,
-		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-		EGL_NONE,
-	};
-
-	ret = eglChooseConfig(disp, attribs, configs, count, &matched);
-	if (ret == EGL_FALSE) {
-		wlr_log(L_ERROR, "eglChooseConfig failed");
-		return false;
-	}
-
-	// TODO
-	*out = configs[0];
-	return true;
-}
-
-static bool egl_init(struct wlr_egl *egl) {
-	if (!load_glapi()) {
-		return false;
-	}
-
-	if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) {
-		wlr_log(L_ERROR, "Failed to bind to the OpenGL ES API: %s", egl_error());
-		goto error;
-	}
-
-	egl->display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-	if (egl->display == EGL_NO_DISPLAY) {
-		wlr_log(L_ERROR, "Failed to create EGL display: %s", egl_error());
-		goto error;
-	}
-
-	EGLint major, minor;
-	if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) {
-		wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error());
-		goto error;
-	}
-
-	if (!egl_get_config(egl->display, &egl->config)) {
-		wlr_log(L_ERROR, "Failed to get EGL config");
-		goto error;
-	}
-
-	static const EGLint attribs[] = {
-		EGL_CONTEXT_CLIENT_VERSION, 2,
-		EGL_NONE,
-	};
-
-	egl->context = eglCreateContext(egl->display, egl->config,
-		EGL_NO_CONTEXT, attribs);
-	if (egl->context == EGL_NO_CONTEXT) {
-		wlr_log(L_ERROR, "Failed to create EGL context: %s", egl_error());
-		goto error;
-	}
-
-	eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context);
-	egl->egl_exts = eglQueryString(egl->display, EGL_EXTENSIONS);
-	if (strstr(egl->egl_exts, "EGL_KHR_image_base") == NULL) {
-		wlr_log(L_ERROR, "Required egl extensions not supported");
-		goto error;
-	}
-
-	egl->gl_exts = (const char*) glGetString(GL_EXTENSIONS);
-	wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor);
-	wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION));
-	wlr_log(L_INFO, "Supported EGL extensions: %s", egl->egl_exts);
-	wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", egl->gl_exts);
-	return true;
-
-error:
-	eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-	eglTerminate(egl->display);
-	eglReleaseThread();
-	return false;
-}
-
 struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
 	wlr_log(L_INFO, "Creating headless backend");
 
@@ -179,7 +87,21 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
 	wl_list_init(&backend->outputs);
 	wl_list_init(&backend->input_devices);
 
-	egl_init(&backend->egl);
+	static const EGLint config_attribs[] = {
+		EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+		EGL_ALPHA_SIZE, 0,
+		EGL_BLUE_SIZE, 8,
+		EGL_GREEN_SIZE, 8,
+		EGL_RED_SIZE, 8,
+		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+		EGL_NONE,
+	};
+	bool ok = wlr_egl_init(&backend->egl, EGL_PLATFORM_SURFACELESS_MESA, NULL,
+		(EGLint *)config_attribs, 0);
+	if (!ok) {
+		free(backend);
+		return NULL;
+	}
 
 	backend->display_destroy.notify = handle_display_destroy;
 	wl_display_add_destroy_listener(display, &backend->display_destroy);
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 6ebc6615..36fbd8e0 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -185,7 +185,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
 	}
 
 	wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT,
-		WL_SHM_FORMAT_ARGB8888, backend->remote_display);
+		backend->remote_display, NULL, WL_SHM_FORMAT_ARGB8888);
 	wlr_egl_bind_display(&backend->egl, backend->local_display);
 
 	backend->local_display_destroy.notify = handle_display_destroy;
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 0d45cfb5..a218c589 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -311,8 +311,8 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
 
 	x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data;
 
-	if (!wlr_egl_init(&x11->egl, EGL_PLATFORM_X11_KHR,
-			x11->screen->root_visual, x11->xlib_conn)) {
+	if (!wlr_egl_init(&x11->egl, EGL_PLATFORM_X11_KHR, x11->xlib_conn, NULL,
+			x11->screen->root_visual)) {
 		goto error_event;
 	}