[Mesa-dev] [PATCH 1/3] egl: android: directly use dri2_create_image_dma_buf()

[Emil Velikov]

On 1 May 2016 at 12:42, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Make the function non static so that we can use it directly from the
> android platform code.
>
> Cc: Rob Herring <robh at kernel.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/egl/drivers/dri2/egl_dri2.c         | 2 +-
>  src/egl/drivers/dri2/egl_dri2.h         | 4 ++++
>  src/egl/drivers/dri2/platform_android.c | 3 +--
>  3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index d8448f4..95dc0d6 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -1960,7 +1960,7 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs)
>   *
>   * Therefore we must never close or otherwise modify the file descriptors.
>   */
> -static _EGLImage *
> +_EGLImage *
>  dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx,
>                           EGLClientBuffer buffer, const EGLint *attr_list)
>  {
> diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
> index ddb5f39..925294b 100644
> --- a/src/egl/drivers/dri2/egl_dri2.h
> +++ b/src/egl/drivers/dri2/egl_dri2.h
> @@ -361,6 +361,10 @@ dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
>                       _EGLContext *ctx, EGLenum target,
>                       EGLClientBuffer buffer, const EGLint *attr_list);
>
> +_EGLImage *
> +dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx,
> +                         EGLClientBuffer buffer, const EGLint *attr_list);
> +
>  EGLBoolean
>  dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp);
>
> diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
> index c837b35..9f0f133 100644
> --- a/src/egl/drivers/dri2/platform_android.c
> +++ b/src/egl/drivers/dri2/platform_android.c
> @@ -494,8 +494,7 @@ dri2_create_image_android_native_buffer(_EGLDriver *drv, _EGLDisplay *disp,
>        if (fourcc == -1 || pitch == 0)
>           return NULL;
>
> -      return dri2_create_image_khr(drv, disp, ctx, EGL_LINUX_DMA_BUF_EXT,
> -         NULL, attr_list);
> +      return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list);
Rob, care to ack this and 2/3 ? Using dri2_create_image_dma_buf over
the generic dri2_create_image_khr seems should make things a bit more
obvious

Thanks
Emil