Mesa (staging/21.1): egl: zero is a valid fd

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: deb5aafdda51e569506ad26c101bb5a00e7056dd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=deb5aafdda51e569506ad26c101bb5a00e7056dd

Author: Rob Clark <robdclark at chromium.org>
Date:   Sun Jun  6 08:43:28 2021 -0700

egl: zero is a valid fd

We shouldn't be using RETURN_EGL_EVAL() for eglDupNativeFenceFDANDROID()
return, as (while perhaps unlikely) zero is a valid fd.  The error case
for EGL_NO_NATIVE_FENCE_FD_ANDROID is already handled in egl_dri2.c
(dri2_dup_native_fence_fd()) so just use RETURN_EGL_SUCCESS() instead.

Also fix ret type.

Fixes: 0201f01dc4e ("egl: add EGL_ANDROID_native_fence_sync")
Signed-off-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11202>
(cherry picked from commit bfeff2c687d8c4f5ddd04792ed51dc0c03b22435)

---

 .pick_status.json     | 2 +-
 src/egl/main/eglapi.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e06472f5d1f..f516996d1ad 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1345,7 +1345,7 @@
         "description": "egl: zero is a valid fd",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0201f01dc4e903d9b60cbbf87fde3ffa7c76f248"
     },
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index df0a0011dbf..17e36af22e1 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -2144,7 +2144,7 @@ eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSync sync)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLSync *s = _eglLookupSync(sync, disp);
-   EGLBoolean ret;
+   EGLint ret;
 
    _EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE);
 
@@ -2159,7 +2159,7 @@ eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSync sync)
    assert(disp->Extensions.ANDROID_native_fence_sync);
    ret = disp->Driver->DupNativeFenceFDANDROID(disp, s);
 
-   RETURN_EGL_EVAL(disp, ret);
+   RETURN_EGL_SUCCESS(disp, ret);
 }
 
 static EGLBoolean EGLAPIENTRY