diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 03:04:27 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 03:04:27 +0000 |
commit | 35ec06564e947f120556eb550fa4001ea5424e8f (patch) | |
tree | b79805b2ba59d012920c08a4c90378978e3828fc | |
parent | 760390d46cec6569edc585486704a2651dbd7d37 (diff) | |
parent | b873e6ad330dda3f1fd0aa17f4f2b618942030ae (diff) | |
download | mesa3d-android13-qpr1-s7-release.tar.gz |
Snap for 8509668 from b873e6ad330dda3f1fd0aa17f4f2b618942030ae to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: I90c823488a7f9271c91b553489adfeb730226e0c
-rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 62 |
1 files changed, 47 insertions, 15 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 782d66a3a87..c8e0e7b2402 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -203,24 +203,56 @@ droid_create_image_from_prime_fds_yuv(_EGLDisplay *disp, int ret; unsigned error; - if (!dri2_dpy->gralloc->lock_ycbcr) { - _eglLog(_EGL_WARNING, "Gralloc does not support lock_ycbcr"); - return NULL; - } - memset(&ycbcr, 0, sizeof(ycbcr)); - ret = dri2_dpy->gralloc->lock_ycbcr(dri2_dpy->gralloc, buf->handle, - 0, 0, 0, 0, 0, &ycbcr); - if (ret) { - /* HACK: See droid_create_image_from_prime_fds() and - * https://issuetracker.google.com/32077885.*/ - if (buf->format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) + if (dri2_dpy->gralloc->lock_ycbcr) { + ret = dri2_dpy->gralloc->lock_ycbcr(dri2_dpy->gralloc, buf->handle, + 0, 0, 0, 0, 0, &ycbcr); + if (ret) { + /* HACK: See droid_create_image_from_prime_fds() and + * https://issuetracker.google.com/32077885.*/ + if (buf->format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) + return NULL; + + _eglLog(_EGL_WARNING, "gralloc->lock_ycbcr failed: %d", ret); return NULL; - - _eglLog(_EGL_WARNING, "gralloc->lock_ycbcr failed: %d", ret); - return NULL; + } + dri2_dpy->gralloc->unlock(dri2_dpy->gralloc, buf->handle); + } else { + _eglLog(_EGL_WARNING, "Gralloc does not support lock_ycbcr!"); + // HACK: Prepare a hardcoded ycrcb struct to prevent crashes while trying + // to create a YVU420_ANDROID or FLEX_YCbCr_420 (NV12) image with gralloc4 + // see: b/225392099 + if (buf->format == HAL_PIXEL_FORMAT_YV12) { + // HAL_PIXEL_FORMAT_YV12 => DRM_FORMAT_YVU420_ANDROID + // The stride of Android YV12 buffers is required to be aligned to 16 bytes + size_t luma_stride = ALIGN(buf->width, 32); + size_t chroma_stride = ALIGN(buf->width/2, 16); + ycbcr.y = 0; + ycbcr.cr = (void*)(luma_stride*buf->height); + ycbcr.cb = (void*)(luma_stride*buf->height+chroma_stride*buf->height/2); + ycbcr.ystride = luma_stride; + ycbcr.cstride = chroma_stride; + ycbcr.chroma_step = 1; + _eglLog(_EGL_WARNING, + "Using a hardcoded ycbcr struct for DRM_FORMAT_YVU420_ANDROID format."); + } else if (buf->format == HAL_PIXEL_FORMAT_YCbCr_420_888) { + // HAL_PIXEL_FORMAT_YCbCr_420_888 => DRM_FORMAT_FLEX_YCbCr_420_888 + size_t luma_stride = buf->width; + size_t chroma_stride = buf->width; + ycbcr.y = 0; + ycbcr.cr = (void*)(luma_stride*buf->height+1); + ycbcr.cb = (void*)(luma_stride*buf->height); + ycbcr.ystride = luma_stride; + ycbcr.cstride = chroma_stride; + ycbcr.chroma_step = 2; + _eglLog(_EGL_WARNING, + "Using a hardcoded ycbcr struct for DRM_FORMAT_FLEX_YCbCr_420_888 format."); + } else { + _eglLog(_EGL_WARNING, + "Unable to create an image for native YUV format %x", buf->format); + return NULL; + } } - dri2_dpy->gralloc->unlock(dri2_dpy->gralloc, buf->handle); /* When lock_ycbcr's usage argument contains no SW_READ/WRITE flags * it will return the .y/.cb/.cr pointers based on a NULL pointer, |