[Mesa-dev] [PATCH] egl/android: Fix build break with dri2_initialize_android _EGLDisplay parameter

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 01/03/2018 06:28 PM, Rob Herring wrote:
> Commit 2f421651aca9 ("egl: let each platform decided how to handle
> LIBGL_ALWAYS_SOFTWARE") broke the build due to copy-n-paste of misnamed
> function parameter.:
> 
> src/egl/drivers/dri2/platform_android.c:1183:8: error: use of undeclared identifier 'disp'
> 
> Rather than just fixing 'disp', rename the function parameter 'dpy' to
> 'disp' to align with the other EGL platforms' implementations.
> 
> Fixes: 2f421651aca9 ("egl: let each platform decided how to handle LIBGL_ALWAYS_SOFTWARE")
> Cc: Eric Engestrom <eric.engestrom at imgtec.com>
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
>   src/egl/drivers/dri2/platform_android.c | 30 +++++++++++++++---------------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
> index 34e3ef66bfeb..4f25cb746915 100644
> --- a/src/egl/drivers/dri2/platform_android.c
> +++ b/src/egl/drivers/dri2/platform_android.c
> @@ -1173,7 +1173,7 @@ static const __DRIextension *droid_image_loader_extensions[] = {
>   };
>   
>   EGLBoolean
> -dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
> +dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp)
>   {
>      struct dri2_egl_display *dri2_dpy;
>      const char *err;
> @@ -1197,7 +1197,7 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
>         goto cleanup;
>      }
>   
> -   dpy->DriverData = (void *) dri2_dpy;
> +   disp->DriverData = (void *) dri2_dpy;
>   
>      dri2_dpy->fd = droid_open_device(dri2_dpy);
>      if (dri2_dpy->fd < 0) {
> @@ -1217,43 +1217,43 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
>       * the __DRI_DRI2_LOADER extension */
>      if (!dri2_dpy->is_render_node) {
>         dri2_dpy->loader_extensions = droid_dri2_loader_extensions;
> -      if (!dri2_load_driver(dpy)) {
> +      if (!dri2_load_driver(disp)) {
>            err = "DRI2: failed to load driver";
>            goto cleanup;
>         }
>      } else {
>         dri2_dpy->loader_extensions = droid_image_loader_extensions;
> -      if (!dri2_load_driver_dri3(dpy)) {
> +      if (!dri2_load_driver_dri3(disp)) {
>            err = "DRI3: failed to load driver";
>            goto cleanup;
>         }
>      }
>   
> -   if (!dri2_create_screen(dpy)) {
> +   if (!dri2_create_screen(disp)) {
>         err = "DRI2: failed to create screen";
>         goto cleanup;
>      }
>   
> -   if (!dri2_setup_extensions(dpy)) {
> +   if (!dri2_setup_extensions(disp)) {
>         err = "DRI2: failed to setup extensions";
>         goto cleanup;
>      }
>   
> -   dri2_setup_screen(dpy);
> +   dri2_setup_screen(disp);
>   
> -   if (!droid_add_configs_for_visuals(drv, dpy)) {
> +   if (!droid_add_configs_for_visuals(drv, disp)) {
>         err = "DRI2: failed to add configs";
>         goto cleanup;
>      }
>   
> -   dpy->Extensions.ANDROID_framebuffer_target = EGL_TRUE;
> -   dpy->Extensions.ANDROID_image_native_buffer = EGL_TRUE;
> -   dpy->Extensions.ANDROID_recordable = EGL_TRUE;
> -   dpy->Extensions.EXT_buffer_age = EGL_TRUE;
> +   disp->Extensions.ANDROID_framebuffer_target = EGL_TRUE;
> +   disp->Extensions.ANDROID_image_native_buffer = EGL_TRUE;
> +   disp->Extensions.ANDROID_recordable = EGL_TRUE;
> +   disp->Extensions.EXT_buffer_age = EGL_TRUE;
>   #if ANDROID_API_LEVEL >= 23
> -   dpy->Extensions.KHR_partial_update = EGL_TRUE;
> +   disp->Extensions.KHR_partial_update = EGL_TRUE;
>   #endif
> -   dpy->Extensions.KHR_image = EGL_TRUE;
> +   disp->Extensions.KHR_image = EGL_TRUE;
>   
>      /* Fill vtbl last to prevent accidentally calling virtual function during
>       * initialization.
> @@ -1263,6 +1263,6 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
>      return EGL_TRUE;
>   
>   cleanup:
> -   dri2_display_destroy(dpy);
> +   dri2_display_destroy(disp);
>      return _eglError(EGL_NOT_INITIALIZED, err);
>   }
>