[EGIT] [core/efl] master 03/20: ecore_evas_drm: check for libglapi presence first

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=31de16d40840381cf9d425441cd55c3b1d57301c

commit 31de16d40840381cf9d425441cd55c3b1d57301c
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Sep 1 14:53:47 2016 -0500

    ecore_evas_drm: check for libglapi presence first
    
    Minor refactor
---
 src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c 
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 59278aa..eef1bda 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -796,6 +796,9 @@ ecore_evas_gl_drm_new_internal(const char *device, unsigned 
int parent EINA_UNUS
    Ecore_Evas_Engine_Drm_Data *edata;
    int method, mw, mh;
 
+   dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL);
+   if (dlerror()) return NULL;
+
    method = evas_render_method_lookup("gl_drm");
    if (!method) return NULL;
 
@@ -817,14 +820,6 @@ ecore_evas_gl_drm_new_internal(const char *device, 
unsigned int parent EINA_UNUS
    edata->bpp = 32; // FIXME: Remove hardcode
    edata->format = DRM_FORMAT_XRGB8888;
 
-   dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL);
-   if (dlerror())
-     {
-        free(edata);
-        free(ee);
-        return NULL;
-     }
-
    if (_ecore_evas_drm_init(edata, device) < 1)
      {
         free(edata);

--