diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-28 22:14:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-28 22:14:11 +0000 |
| commit | e8d053b0f554ce3ee339f409eb678780be169141 (patch) | |
| tree | 855fafaa6ce616675b24d2861cf5219af1c57ba8 | |
| parent | d67b0a4ea02206de9be91850b31ce80e85ffaa00 (diff) | |
| parent | c4b979a5ef93a3aa99e598683d8ac4200a9f2978 (diff) | |
| download | mesa3d-e8d053b0f554ce3ee339f409eb678780be169141.tar.gz | |
Merge "Hack to handle latest minigbm changes" am: fec253b829 am: c4b979a5ef
Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2019198
Change-Id: I0caa8e28c7387a976931305b867d098b8265dd03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/egl/Android.mk | 5 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/egl/Android.mk b/src/egl/Android.mk index 322a1113841..823ba94100c 100644 --- a/src/egl/Android.mk +++ b/src/egl/Android.mk @@ -88,6 +88,11 @@ ifneq ($(MESA_BUILD_GALLIUM),) LOCAL_REQUIRED_MODULES += gallium_dri endif +# TODO(b/223646636): Temporary hack for handles with HDR metadata fds +ifeq ($(BOARD_GPU_DRIVERS),virgl) +LOCAL_CFLAGS += -DNUM_FDS_HACK +endif + LOCAL_MODULE := libGLES_mesa LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT LOCAL_LICENSE_CONDITIONS := notice diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 2b75dfa98a4..782d66a3a87 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -174,7 +174,11 @@ get_native_buffer_fds(struct ANativeWindowBuffer *buf, int fds[3]) for (int i = 0; i < handle->numFds; i++) fds[i] = handle->data[i]; +#ifdef NUM_FDS_HACK + return 1; +#else return handle->numFds; +#endif } #ifdef HAVE_DRM_GRALLOC |