[Mesa-dev] [PATCH 2/3] egl/android: #ifdef out flink name support

[Tomasz Figa]

Hi Rob,

Sorry for late review. Had some really busy time.

On Fri, May 11, 2018 at 10:48 PM Robert Foss <robert.foss at collabora.com>
wrote:
[snip]
> @@ -1230,20 +1256,26 @@ dri2_initialize_android(_EGLDriver *drv,
_EGLDisplay *disp)

>      dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) ==
DRM_NODE_RENDER;

> -   /* render nodes cannot use Gem names, and thus do not support
> -    * the __DRI_DRI2_LOADER extension */
>      if (!dri2_dpy->is_render_node) {
> -      dri2_dpy->loader_extensions = droid_dri2_loader_extensions;
> -      if (!dri2_load_driver(disp)) {
> -         err = "DRI2: failed to load driver";
> -         goto cleanup;
> -      }
> +   #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.) */
> +       dri2_dpy->loader_extensions = droid_dri2_loader_extensions;
> +       if (!dri2_load_driver(disp)) {
> +          err = "DRI2: failed to load driver";
> +          goto cleanup;
> +       }
> +   #else
> +       err = "DRI2: handle is not for a render node";
> +       goto cleanup;
> +   #endif
>      } else {
> -      dri2_dpy->loader_extensions = droid_image_loader_extensions;
> -      if (!dri2_load_driver_dri3(disp)) {
> -         err = "DRI3: failed to load driver";
> -         goto cleanup;
> -      }
> +       dri2_dpy->loader_extensions = droid_image_loader_extensions;
> +       if (!dri2_load_driver_dri3(disp)) {
> +          err = "DRI3: failed to load driver";
> +          goto cleanup;
> +       }

Is it just me or there is something wrong with indentation here?

Besides this nit, the patch looks good to me, so feel free to add my
Reviewed-by after fixing it up.

Best regards,
Tomasz