From d7c730a43db9c2e98217701bfe5cff5bffb3a0ed Mon Sep 17 00:00:00 2001 From: Taekyun Kim Date: Thu, 18 Jun 2015 17:27:17 +0900 Subject: [PATCH] x11: Don't check success of gl renderer creation as it is optional. Fall back to pixman renderer when gl renderer creation fails. Change-Id: I530ae4f2e1425c13902d2b9c0e57f586513919c0 --- x11/src/x11-common.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/x11/src/x11-common.c b/x11/src/x11-common.c index 994f039..7234836 100644 --- a/x11/src/x11-common.c +++ b/x11/src/x11-common.c @@ -216,6 +216,9 @@ pepper_x11_connect(pepper_object_t *compositor, const char *display_name) return NULL; } + connection->gl_renderer = pepper_gl_renderer_create(connection->compositor, + connection->display, "x11"); + connection->pixman_renderer = pepper_pixman_renderer_create(connection->compositor); if (!connection->pixman_renderer) { @@ -224,16 +227,6 @@ pepper_x11_connect(pepper_object_t *compositor, const char *display_name) return NULL; } - connection->gl_renderer = pepper_gl_renderer_create(connection->compositor, - connection->display, "x11"); - if (!connection->gl_renderer) - { - PEPPER_ERROR("Failed to create gl renderer.\n"); - free(connection); - return NULL; - } - - scr_iter = xcb_setup_roots_iterator(xcb_get_setup(connection->xcb_connection)); connection->screen = scr_iter.data; -- 2.34.1