fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl/android: Use droid_create_image_from_prime_fds() in get_back_bo()

Browse source 
This function wants to create a __DRIimage for an ANativeWindowBuffer,
which is mostly the same logic as when we create an EGLImage for an
ANativeWindowBuffer.  Reuse droid_create_image_from_prime_fds().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6055>
This commit is contained in:
Kristian H. Kristensen 2020-08-10 18:44:34 -07:00 • committed by Marge Bot
parent cad9d42bb4
commit acb235c0c8
1 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -717,11 +717,7 @@ get_front_bo(struct dri2_egl_surface *dri2_surf, unsigned int format)
static int
get_back_bo(struct dri2_egl_surface *dri2_surf)
{
struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display);
int fourcc, pitch;
int offset = 0, fds[3];
unsigned num_fds;
_EGLDisplay *disp = dri2_surf->base.Resource.Display;
if (dri2_surf->dri_image_back)
return 0;
@ -732,33 +728,8 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
return -1;
}
num_fds = get_native_buffer_fds(dri2_surf->buffer, fds);
if (num_fds == 0) {
_eglLog(_EGL_WARNING, "Could not get native buffer FD");
return -1;
}
fourcc = get_fourcc(dri2_surf->buffer->format);
pitch = dri2_surf->buffer->stride *
get_format_bpp(dri2_surf->buffer->format);
if (fourcc == -1 || pitch == 0) {
_eglLog(_EGL_WARNING, "Invalid buffer fourcc(%x) or pitch(%d)",
fourcc, pitch);
return -1;
}
dri2_surf->dri_image_back =
dri2_dpy->image->createImageFromFds(dri2_dpy->dri_screen,
dri2_surf->base.Width,
dri2_surf->base.Height,
fourcc,
fds,
num_fds,
&pitch,
&offset,
dri2_surf);
droid_create_image_from_prime_fds(disp, dri2_surf->buffer);
if (!dri2_surf->dri_image_back) {
_eglLog(_EGL_WARNING, "failed to create DRI image from FD");
return -1;