Mesa (master): egl: simplify eglSwapInterval() fallback logic

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f4c1c21306060c904210fd596421cf077b2eb613
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4c1c21306060c904210fd596421cf077b2eb613

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Sun Aug  2 00:43:52 2020 +0200

egl: simplify eglSwapInterval() fallback logic

Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6153>

---

 src/egl/main/eglapi.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index e6ee31ceb18..405be0367d9 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1287,15 +1287,10 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval)
                     surf->Config->MinSwapInterval,
                     surf->Config->MaxSwapInterval);
 
-   if (surf->SwapInterval != interval) {
-      if (disp->Driver->SwapInterval)
-         ret = disp->Driver->SwapInterval(disp, surf, interval);
-      else
-         ret = EGL_TRUE;
-   }
-   else {
+   if (surf->SwapInterval != interval && disp->Driver->SwapInterval)
+      ret = disp->Driver->SwapInterval(disp, surf, interval);
+   else
       ret = EGL_TRUE;
-   }
 
    if (ret)
       surf->SwapInterval = interval;