[Mesa-dev] [PATCH 3/5] egl/dri2: load libglapi.0.dylib on osx

[Emil Velikov]

On 19 June 2015 at 00:14, Julien Isorce <julien.isorce at gmail.com> wrote:
> On 18 June 2015 at 19:29, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>>
>> On 18 June 2015 at 06:53, Julien Isorce <julien.isorce at gmail.com> wrote:
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90903
>> > Signed-off-by: Julien Isorce <j.isorce at samsung.com>
>> > ---
>> >  src/egl/drivers/dri2/egl_dri2.c | 2 ++
>> >  1 file changed, 2 insertions(+)
>> >
>> > diff --git a/src/egl/drivers/dri2/egl_dri2.c
>> > b/src/egl/drivers/dri2/egl_dri2.c
>> > index a1cbd43..90b9648 100644
>> > --- a/src/egl/drivers/dri2/egl_dri2.c
>> > +++ b/src/egl/drivers/dri2/egl_dri2.c
>> > @@ -2354,6 +2354,8 @@ dri2_load(_EGLDriver *drv)
>> >  #ifdef HAVE_SHARED_GLAPI
>> >  #ifdef HAVE_ANDROID_PLATFORM
>> >     const char *libname = "libglapi.so";
>> > +#elif defined(__APPLE__)
>> > +   const char *libname = "libglapi.0.dylib";
>> >  #else
>> Is this enough to get dri modules (suspecting only swrast atm) working
>> with EGL ?
>
>
> Well at least es2_info and es2gears_x11 are working (with both
> GALLIUM_DRIVER=softpipe  and llvmpipe). I have attached a screenshot:
> https://bugs.freedesktop.org/attachment.cgi?id=116583
>
Great news. Thanks for the confirmation.

>>
>>
>> Note that currently libEGL already explicitly links against libglapi,
>> so imho we can just drop the whole thing. Haven't really looked but do
>> we use glFlush() as a workaround or it's something required by the EGL
>> standard ?
>
>
> No idea but without the patch you get:
>
> EGL_LOG_LEVEL=debug  es2_info
>
> libEGL debug: Native platform type: x11 (autodetected)
>
> libEGL debug: added egl_dri2 to module array
>
> libEGL warning: DRI2: failed to find _glapi_get_proc_address
>
> libEGL debug: EGL user error 0x3001 (EGL_NOT_INITIALIZED) in eglInitialize
>
> Error: eglInitialize() failed
>
I never meant that it will work as is, but mentioned a few things
about simplifying/cleaning-up the whole thing. I have some ancient
fixes in the area that I'll respin and send out in a few hours.

Cheers
Emil