fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-11 09:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

egl/android: Simplify droid_create_image_from_name() path

Browse source 
This can now return an __DRIimage which we'll wrap in the shared code
in dri2_create_image_android_native_buffer().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6055>
This commit is contained in:
Kristian H. Kristensen 2020-08-06 17:39:47 -07:00 • committed by Marge Bot
parent d47b6f330c
commit 5c8b67ed0c
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/egl/drivers/dri2/platform_android.c
View file

@ -941,7 +941,7 @@ droid_create_image_from_name(_EGLDisplay *disp,
struct ANativeWindowBuffer *buf) struct ANativeWindowBuffer *buf)
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_image *dri2_img; __DRIimage *dri_image;
int name; int name;
int format; int format;
@ -955,15 +955,7 @@ droid_create_image_from_name(_EGLDisplay *disp,
if (format == -1) if (format == -1)
return NULL; return NULL;
dri2_img = calloc(1, sizeof(*dri2_img)); return
if (!dri2_img) {
_eglError(EGL_BAD_ALLOC, "droid_create_image_mesa_drm");
return NULL;
}
_eglInitImage(&dri2_img->base, disp);
dri2_img->dri_image =
dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen, dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen,
buf->width, buf->width,
buf->height, buf->height,
@ -971,13 +963,6 @@ droid_create_image_from_name(_EGLDisplay *disp,
name, name,
buf->stride, buf->stride,
dri2_img); dri2_img);
if (!dri2_img->dri_image) {
free(dri2_img);
_eglError(EGL_BAD_ALLOC, "droid_create_image_mesa_drm");
return NULL;
}
return &dri2_img->base;
} }
#endif /* HAVE_DRM_GRALLOC */ #endif /* HAVE_DRM_GRALLOC */
@ -1032,14 +1017,16 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp,
__DRIimage *dri_image = __DRIimage *dri_image =
droid_create_image_from_prime_fds(disp, buf); droid_create_image_from_prime_fds(disp, buf);
#ifdef HAVE_DRM_GRALLOC
if (dri_image == NULL)
dri_image = droid_create_image_from_name(disp, buf);
#endif
if (dri_image) if (dri_image)
return dri2_create_image_from_dri(disp, dri_image); return dri2_create_image_from_dri(disp, dri_image);
#ifdef HAVE_DRM_GRALLOC
return droid_create_image_from_name(disp, buf);
#else
return NULL; return NULL;
#endif
} }
static _EGLImage * static _EGLImage *