[Mesa-dev] [PATCH] egl: fold Android logger into main/ (v2)

[Mauro Rossi]

2017-05-11 14:38 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
> On 11 May 2017 at 13:07, Mauro Rossi <issor.oruam at gmail.com> wrote:
>> 2017-05-11 13:25 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
>>> On 9 May 2017 at 00:24, Mauro Rossi <issor.oruam at gmail.com> wrote:
>>>> Fixes the folloing building error:
>>>>
>>>> external/mesa/src/egl/drivers/dri2/platform_android.c:1492:19:
>>>> error: use of undeclared identifier 'droid_log'
>>>>    _eglSetLogProc(droid_log);
>>>>                   ^
>>>> 1 error generated.
>>>>
>>>> Fixes: 0372097 "egl: fold Android logger into main/"
>>>> ---
>>>>  src/egl/drivers/dri2/platform_android.c | 2 --
>>>>  1 file changed, 2 deletions(-)
>>>>
>>>> diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
>>>> index 39bbfe57a0..3d0c85c3dd 100644
>>>> --- a/src/egl/drivers/dri2/platform_android.c
>>>> +++ b/src/egl/drivers/dri2/platform_android.c
>>>> @@ -1489,8 +1489,6 @@ dri2_initialize_android_swrast(_EGLDriver *drv, _EGLDisplay *dpy)
>>>>     const char *err = "";
>>>>     const hw_module_t *mod;
>>>>
>>>> -   _eglSetLogProc(droid_log);
>>>> -
>>> Slightly confused here. The original patch already does this.
>>> I'm assuming that something has gone crazy while rebasing things on your end?
>>>
>>> -Emil
>>
>> Hi Emil,
>>
>> Please check at the line 1492,
>> because your patch removes it only in a previous line.
> The file in master is only 1180 lines ;-)
>
> The issue is rebase goof with commit 0d6f0b7d3c7 ("android: egl: add
> support for software rasterizer")
>
> -Emil

You're right, my fault, the discrepancy is due to our branches swrast patches
Thanks

Mauro