[Mesa-stable] [PATCH] egl/android: do not indent HAVE_DRM_GRALLOC preprocessor directive

[Mauro Rossi]

Hi Andres,

In the attachement a patch that fixes commits that were originally in
mesa 18.2 branch
that was applied to mesa master:

https://cgit.freedesktop.org/mesa/mesa/commit/?id=ac0856ae4100a05dcd1fd932d9fd10200f8f7a7c

Emil told me it's not strictly necessary to apply in mesa 18.2.0,
but the commits to fix are also there and the patch applies cleanly in 18.2

So I wanted to check with you, I would propose as a candidate for
18.2.0 release, if there is still time
Mauro


Il giorno mer 15 ago 2018 alle ore 15:13 Mauro Rossi
<issor.oruam at 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.oruam at 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
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-egl-android-do-not-indent-HAVE_DRM_GRALLOC-preproces.patch
Type: text/x-patch
Size: 1615 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20180902/d8977ab6/attachment.bin>