commit c0372d219c0f003d62cee992ebf0eea48945e0af
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 20:03:21 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 20:03:21 2022 +0000
tree 855fafaa6ce616675b24d2861cf5219af1c57ba8
parent 379459525c317c75be1a567a8c81404d3e80db58
parent aff186a2814b334bc2487b7478f7a9dfb0c3ae76

Snap for 8505378 from aff186a2814b334bc2487b7478f7a9dfb0c3ae76 to mainline-go-adservices-release

Change-Id: I185eecb90234bc0e6f07ceb4f79b226ee5ef6061

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