commit f4c1c21306060c904210fd596421cf077b2eb613
author Eric Engestrom <eric@engestrom.ch> Sun Aug 02 00:43:52 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Fri Aug 28 08:55:06 2020 +0000
tree b0196e8919a0ae673f5c05c729cc8e68a9aeb23a
parent 1d3fb7a7a7d47be640f7603de33cf5a685ee3aac

egl: simplify eglSwapInterval() fallback logic

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

src/egl/main/eglapi.c

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index e6ee31c..405be03 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1287,15 +1287,10 @@
                     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;