From b8165098dc24f75c136d32694076337b6304509a Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 30 Jun 2017 14:52:54 -0500 Subject: [PATCH] gl_drm: Improve dmabuf validity test Now that higher layers are setting load errors this can be less gruesome. --- src/modules/evas/engines/gl_drm/evas_engine.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index 44134464e8..b69ba2cbdf 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -1202,12 +1202,16 @@ eng_image_native_set(void *engine, void *image, void *native) attr = ns->data.wl_dmabuf.attr; if (attr->version == EVAS_DMABUF_ATTRIBUTE_VERSION) v = gl_import_simple_dmabuf(ob->egl.disp, attr); - if (!v) { - ns->data.wl_dmabuf.attr = NULL; - return NULL; - } + if (!v) return NULL; + glsym_eglDestroyImage(ob->egl.disp, v); - return NULL; + img = + glsym_evas_gl_common_image_new_from_data(ob->gl_context, + attr->width, + attr->height, + NULL, 1, + EVAS_COLORSPACE_ARGB8888); + return img; } } else