From 3adac6affc52bb52b3d2fc3fead44d9d5166434b Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Thu, 20 Aug 2020 18:46:57 +0300 Subject: [PATCH] egl: android: use num_planes param in createImageFromDmaBufs() Fixes 972f36d8fa62 ("egl/android: Call createImageFromDmaBufs directly") Signed-off-by: Roman Stratiienko Reviewed-by: Rob Clark Part-of: --- src/egl/drivers/dri2/platform_android.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 22f48f27c8f..2bae8090eb9 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -255,16 +255,16 @@ droid_create_image_from_prime_fds_yuv(_EGLDisplay *disp, * the single-fd case cannot happen. So handle eithe single * fd or fd-per-plane case: */ + int num_planes = (ycbcr.chroma_step == 2) ? 2 : 3; if (num_fds == 1) { fds[2] = fds[1] = fds[0]; } else { - int expected_planes = (ycbcr.chroma_step == 2) ? 2 : 3; - assert(num_fds == expected_planes); + assert(num_fds == num_planes); } return dri2_dpy->image->createImageFromDmaBufs(dri2_dpy->dri_screen, buf->width, buf->height, fourcc, - fds, num_fds, pitches, offsets, + fds, num_planes, pitches, offsets, EGL_ITU_REC601_EXT, EGL_YUV_NARROW_RANGE_EXT, EGL_YUV_CHROMA_SITING_0_EXT,