[Mesa-dev] [PATCH] egl/dri: link directly to libglapi.so

[Eric Engestrom]

On Tuesday, 2017-09-19 17:19:59 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> In order to build EGL, one has to use shared glapi - libglapi.so.
> 
> Thus the dlopen/dlsym dance is no longer needed and we can link to the
> library directly.
> 
> This allows us to remove a handful of platform specific names of the
> library.
> 
> Cc: Jonathan Gray <jsg at jsg.id.au>
> Cc: Jon Turney <jon.turney at dronecode.org.uk>
> Cc: Julien Isorce <julien.isorce at gmail.com>
> Cc: Rob Herring <robh at kernel.org>
> Cc: Tomasz Figa <tfiga at chromium.org>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/egl/Android.mk              |  2 ++
>  src/egl/Makefile.am             |  2 ++
>  src/egl/drivers/dri2/egl_dri2.c | 40 ++++------------------------------------
>  src/egl/drivers/dri2/egl_dri2.h |  2 --
>  4 files changed, 8 insertions(+), 38 deletions(-)
> 
[snip]
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 42bca61cfda..c67117212c8 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -64,6 +64,7 @@
>  #include "loader/loader.h"
>  #include "util/u_atomic.h"
>  #include "util/u_vector.h"
> +#include "mapi/glapi/glapi.h"
>  
>  /* The kernel header drm_fourcc.h defines the DRM formats below.  We duplicate
>   * some of the definitions here so that building Mesa won't bleeding-edge
> @@ -1556,7 +1557,7 @@ dri2_get_proc_address(_EGLDriver *drv, const char *procname)
>  {
>     struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv);

^ dead code (== compiler warning)

>  
> -   return dri2_drv->get_proc_address(procname);
> +   return _glapi_get_proc_address(procname);
>  }
>