From dd9eb8db13b85a764d29c0c2fa1b0c416fae7581 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 2 Aug 2017 17:25:44 +0100 Subject: 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 Signed-off-by: Eric Engestrom Tested-by: Cedric Sodhi --- 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 a197e0456fd..733659d547f 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 65fb117f087..c5e3955c48c 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; -- cgit v1.2.3