From 34ce0bb4997a232906b540ddfa90ba55ce922aa3 Mon Sep 17 00:00:00 2001 From: Taekyun Kim Date: Wed, 23 Sep 2015 18:40:34 +0900 Subject: [PATCH] render: x11: Fix GL renderer to work with x11 backend Change-Id: Ied853914cd43c587a8f99f34bc12cfe8240535ac --- src/lib/render/gl-renderer.c | 8 +++++--- src/lib/x11/x11-output.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/render/gl-renderer.c b/src/lib/render/gl-renderer.c index cbe6b97..0d18e43 100644 --- a/src/lib/render/gl-renderer.c +++ b/src/lib/render/gl-renderer.c @@ -460,8 +460,11 @@ surface_state_destroy_images(gl_surface_state_t *state) for (i = 0; i < state->num_planes; i++) { - state->renderer->destroy_image(state->renderer->display, state->images[i]); - state->images[i] = EGL_NO_IMAGE_KHR; + if (state->images[i] != EGL_NO_IMAGE_KHR) + { + state->renderer->destroy_image(state->renderer->display, state->images[i]); + state->images[i] = EGL_NO_IMAGE_KHR; + } } } @@ -968,7 +971,6 @@ setup_egl_extensions(gl_renderer_t *gr) else { PEPPER_ERROR("EGL_KHR_image not supported.\n"); - return PEPPER_FALSE; } #ifdef EGL_EXT_swap_buffers_with_damage diff --git a/src/lib/x11/x11-output.c b/src/lib/x11/x11-output.c index 7093fa4..60f0296 100644 --- a/src/lib/x11/x11-output.c +++ b/src/lib/x11/x11-output.c @@ -93,7 +93,7 @@ gl_renderer_init(x11_output_t *output) &output->connection->screen->root_visual, output->w, output->h); - if (!output->target) + if (!output->gl_target) { PEPPER_ERROR("Failed to create gl render target.\n"); return PEPPER_FALSE; -- 2.7.4