commit 760390d46cec6569edc585486704a2651dbd7d37
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:35:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:35:15 2022 +0000
tree 855fafaa6ce616675b24d2861cf5219af1c57ba8
parent 379459525c317c75be1a567a8c81404d3e80db58
parent 7786c1d3d609846e3ee5ba9bbdfd68ad4e8195c6

Snap for 8414339 from 7786c1d3d609846e3ee5ba9bbdfd68ad4e8195c6 to tm-qpr1-release

Change-Id: Ice4c9c35f919536b6e708a08ca6bfa3bf01365c7

src/egl/Android.mk

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 322a111..823ba94 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -88,6 +88,11 @@
 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

src/egl/drivers/dri2/platform_android.c

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 2b75dfa..782d66a 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -174,7 +174,11 @@
    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