On 24 August 2018 at 20:54, Mauro Rossi <issor.or...@gmail.com> wrote:
> Hi,
>
> Il giorno mer 15 ago 2018 alle ore 15:13 Mauro Rossi
> <issor.or...@gmail.com> ha scritto:
>>
>> Fixes: 3f7bca44d9 ("egl/android: #ifdef out flink name support")
>> Fixes: c7bb82136b ("egl/android: Add DRM node probing and filtering")
>> Signed-off-by: Mauro Rossi <issor.or...@gmail.com>
>> ---
>> src/egl/drivers/dri2/platform_android.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/egl/drivers/dri2/platform_android.c
>> b/src/egl/drivers/dri2/platform_android.c
>> index 834bbd258e..f8c85f97cf 100644
>> --- a/src/egl/drivers/dri2/platform_android.c
>> +++ b/src/egl/drivers/dri2/platform_android.c
>> @@ -1226,7 +1226,7 @@ droid_load_driver(_EGLDisplay *disp)
>> dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) ==
>> DRM_NODE_RENDER;
>>
>> if (!dri2_dpy->is_render_node) {
>> - #ifdef HAVE_DRM_GRALLOC
>> +#ifdef HAVE_DRM_GRALLOC
>> /* Handle control nodes using __DRI_DRI2_LOADER extension and GEM
>> names
>> * for backwards compatibility with drm_gralloc. (Do not use on new
>> * systems.) */
>> @@ -1235,10 +1235,10 @@ droid_load_driver(_EGLDisplay *disp)
>> err = "DRI2: failed to load driver";
>> goto error;
>> }
>> - #else
>> +#else
>> err = "DRI2: handle is not for a render node";
>> goto error;
>> - #endif
>> +#endif
>> } else {
>> dri2_dpy->loader_extensions = droid_image_loader_extensions;
>> if (!dri2_load_driver_dri3(disp)) {
>> --
>> 2.17.1
>>
>
> Please provide one R-b ,
> in order to proceed in commit to gitlab master
> and propose as candidate for mesa 18.2.0 release
>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
I wouldn't worry too much about landing this in 18.2.0 since it's
mostly a cosmetic change.
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
