Change default return value for eglDupNativeFenceFDANDROID

According to EGL spec, eglDupNativeFenceFDANDROID should return EGL_NO_NATIVE_FENCE_FD_ANDROID when there is error. However, ANGLE just returns 0 as default value. Now overload the default return value to EGL_NO_NATIVE_FENCE_FD_ANDROID. Also, a end2end test is added. Bug: angleproject:385190296 Change-Id: I214efdeb3ad583989fab5e2244c82cb7295f8b67 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6146195 Commit-Queue: Shahbaz Youssefi <[email protected]> Reviewed-by: Shahbaz Youssefi <[email protected]> Reviewed-by: Roman Lavrov <[email protected]>
google · Jan 13, 2025 · 4c60a30 · 4c60a30
1 parent 2827060
commit 4c60a30
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/libANGLE/validationEGL.h b/src/libANGLE/validationEGL.h
@@ -100,6 +100,13 @@ GetDefaultReturnValue<angle::EntryPoint::EGLLabelObjectKHR, EGLint>(Thread *thre
     return thread->getError();
 }
 
+template <>
+ANGLE_INLINE EGLint
+GetDefaultReturnValue<angle::EntryPoint::EGLDupNativeFenceFDANDROID, EGLint>(Thread *thread)
+{
+    return EGL_NO_NATIVE_FENCE_FD_ANDROID;
+}
+
 template <angle::EntryPoint EP, typename ReturnType>
 ANGLE_INLINE ReturnType GetDefaultReturnValue(Thread *thread)
 {

diff --git a/src/tests/egl_tests/EGLSyncTest.cpp b/src/tests/egl_tests/EGLSyncTest.cpp
@@ -367,6 +367,21 @@ TEST_P(EGLSyncTest, AndroidNativeFence_DupNativeFenceFD)
     EXPECT_EGL_TRUE(eglDestroySyncKHR(display, syncWithGeneratedFD));
 }
 
+// Test the validation errors for bad parameters for eglDupNativeFenceFDANDROID
+TEST_P(EGLSyncTest, AndroidNativeFence_DupNativeFenceFD_NegativeValidation)
+{
+    ANGLE_SKIP_TEST_IF(!hasFenceSyncExtension());
+    ANGLE_SKIP_TEST_IF(!hasFenceSyncExtension() || !hasGLSyncExtension());
+    ANGLE_SKIP_TEST_IF(!hasAndroidNativeFenceSyncExtension());
+
+    EGLDisplay display = getEGLWindow()->getDisplay();
+
+    int fd;
+    fd = eglDupNativeFenceFDANDROID(display, EGL_NO_SYNC_KHR);
+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
+    EXPECT_EQ(fd, EGL_NO_NATIVE_FENCE_FD_ANDROID);
+}
+
 // Verify CreateSync and ClientWait for EGL_ANDROID_native_fence_sync
 TEST_P(EGLSyncTest, AndroidNativeFence_ClientWait)
 {