AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/dri2: non-shared glapi cleanups

Browse Source 
For a while now we require shared glapi for EGL, thus we can drop a
few bits from the olden days. Namely - dlopen(NULL...) is not possible,
error out at build stage if so and drop the guard around dlclose().

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Emil Velikov
2016-08-16 16:33:49 +01:00
committed by Emil Velikov
parent b349c11098
commit 7a9c92d071
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egl/drivers/dri2/egl_dri2.c
+17 -14
View File
@@ -2790,8 +2790,7 @@ dri2_unload(_EGLDriver *drv)
{ {
struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv); struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv);
if (dri2_drv->handle) dlclose(dri2_drv->handle);
dlclose(dri2_drv->handle);
free(dri2_drv); free(dri2_drv);
} }
@@ -2805,27 +2804,27 @@ dri2_load(_EGLDriver *drv)
const char *libname = "libglapi.0.dylib"; const char *libname = "libglapi.0.dylib";
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
const char *libname = "cygglapi-0.dll"; const char *libname = "cygglapi-0.dll";
#else #elif defined(__linux__)
const char *libname = "libglapi.so.0"; const char *libname = "libglapi.so.0";
#else
#error Unknown glapi provider for this platform
#endif #endif
void *handle; void *handle;
/* RTLD_GLOBAL to make sure glapi symbols are visible to DRI drivers */ /* RTLD_GLOBAL to make sure glapi symbols are visible to DRI drivers */
handle = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL); handle = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL);
if (handle) { if (!handle) {
dri2_drv->get_proc_address = (_EGLProc (*)(const char *)) _eglLog(_EGL_WARNING, "DRI2: failed to open glapi provider");
dlsym(handle, "_glapi_get_proc_address"); goto no_handle;
if (!dri2_drv->get_proc_address || !libname) {
/* no need to keep a reference */
dlclose(handle);
handle = NULL;
}
} }
dri2_drv->get_proc_address = (_EGLProc (*)(const char *))
dlsym(handle, "_glapi_get_proc_address");
/* if glapi is not available, loading DRI drivers will fail */ /* if glapi is not available, loading DRI drivers will fail */
if (!dri2_drv->get_proc_address) { if (!dri2_drv->get_proc_address) {
_eglLog(_EGL_WARNING, "DRI2: failed to find _glapi_get_proc_address"); _eglLog(_EGL_WARNING, "DRI2: failed to find _glapi_get_proc_address");
return EGL_FALSE; goto no_symbol;
} }
dri2_drv->glFlush = (void (*)(void)) dri2_drv->glFlush = (void (*)(void))
@@ -2834,12 +2833,16 @@ dri2_load(_EGLDriver *drv)
/* if glFlush is not available things are horribly broken */ /* if glFlush is not available things are horribly broken */
if (!dri2_drv->glFlush) { if (!dri2_drv->glFlush) {
_eglLog(_EGL_WARNING, "DRI2: failed to find glFlush entry point"); _eglLog(_EGL_WARNING, "DRI2: failed to find glFlush entry point");
return EGL_FALSE; goto no_symbol;
} }
dri2_drv->handle = handle; dri2_drv->handle = handle;
return EGL_TRUE; return EGL_TRUE;
no_symbol:
dlclose(handle);
no_handle:
return EGL_FALSE;
} }
/** /**