Mesa (master): egl: check the correct function pointer

[Eric Engeström]

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

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Wed Aug  2 17:25:44 2017 +0100

egl: check the correct function pointer

`.swap_interval` != `.SwapInterval`...

Fixes: 991ec1b81a76de24fd01 "egl: make platform's SwapInterval() optional"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102015
Cc: Cedric Sodhi <manday at openmail.cc>
Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Tested-by: Cedric Sodhi <manday at openmail.cc>

---

 src/egl/drivers/dri2/egl_dri2.c | 2 ++
 src/egl/main/eglapi.c           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index a197e0456f..733659d547 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1455,6 +1455,8 @@ dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf,
                    EGLint interval)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
+   if (!dri2_dpy->vtbl->swap_interval)
+      return EGL_TRUE;
    return dri2_dpy->vtbl->swap_interval(drv, dpy, surf, interval);
 }
 
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 65fb117f08..c5e3955c48 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1205,7 +1205,7 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval)
                     surf->Config->MinSwapInterval,
                     surf->Config->MaxSwapInterval);
 
-   if (surf->SwapInterval != interval && drv->API.SwapInterval)
+   if (surf->SwapInterval != interval)
       ret = drv->API.SwapInterval(drv, disp, surf, interval);
    else
       ret = EGL_TRUE;