summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-08-02 17:25:44 +0100
committerEric Engestrom <[email protected]>2017-08-02 18:03:47 +0100
commitdd9eb8db13b85a764d29c0c2fa1b0c416fae7581 (patch)
treeee0365cc8c51a91dbdf9d7b6d34809b1ba2e0ed6
parent595a47b8293b1d97a3ae7dbfa8db703bfb4e7aae (diff)
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 <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Tested-by: Cedric Sodhi <[email protected]>
-rw-r--r--src/egl/drivers/dri2/egl_dri2.c2
-rw-r--r--src/egl/main/eglapi.c2
2 files changed, 3 insertions, 1 deletions
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;