[PATCH weston] gl-renderer: gl_renderer_create display cleanup on error

Dawid Gajownik gajownik at gmail.com
Thu Aug 20 20:20:54 PDT 2015


Clean up display connection via eglTerminate() in case of EGL
initialisation error.

Signed-off-by: Dawid Gajownik <gajownik at gmail.com>
---
 src/gl-renderer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index fd0720e..d7231f4 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -2649,7 +2649,7 @@ gl_renderer_create(struct weston_compositor *ec, EGLenum platform,
 	if (egl_choose_config(gr, attribs, visual_id,
 			      n_ids, &gr->egl_config) < 0) {
 		weston_log("failed to choose EGL config\n");
-		goto fail;
+		goto fail_terminate;
 	}
 
 	ec->renderer = &gr->base;
@@ -2672,6 +2672,8 @@ gl_renderer_create(struct weston_compositor *ec, EGLenum platform,
 
 fail_with_error:
 	gl_renderer_print_egl_error_state();
+fail_terminate:
+	eglTerminate(gr->egl_display);
 fail:
 	free(gr);
 	return -1;
-- 
2.4.3



More information about the wayland-devel mailing list