Mesa (master): egl: make platform's SwapInterval() optional
Eric Engeström
eric_engestrom at kemper.freedesktop.org
Tue Aug 1 16:38:27 UTC 2017
Module: Mesa
Branch: master
Commit: 991ec1b81a76de24fd013d2fd6b803408c97ab64
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=991ec1b81a76de24fd013d2fd6b803408c97ab64
Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date: Mon Jul 31 18:03:16 2017 +0100
egl: make platform's SwapInterval() optional
Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/egl/drivers/dri2/platform_wayland.c | 11 -----------
src/egl/main/eglapi.c | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 02db473c8c..73966b7c50 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1139,15 +1139,6 @@ static const struct wl_registry_listener registry_listener_drm = {
.global_remove = registry_handle_global_remove
};
-static EGLBoolean
-dri2_wl_swap_interval(_EGLDriver *drv,
- _EGLDisplay *disp,
- _EGLSurface *surf,
- EGLint interval)
-{
- return EGL_TRUE;
-}
-
static void
dri2_wl_setup_swap_interval(struct dri2_egl_display *dri2_dpy)
{
@@ -1193,7 +1184,6 @@ static const struct dri2_egl_display_vtbl dri2_wl_display_vtbl = {
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
.destroy_surface = dri2_wl_destroy_surface,
.create_image = dri2_create_image_khr,
- .swap_interval = dri2_wl_swap_interval,
.swap_buffers = dri2_wl_swap_buffers,
.swap_buffers_with_damage = dri2_wl_swap_buffers_with_damage,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
@@ -1894,7 +1884,6 @@ static const struct dri2_egl_display_vtbl dri2_wl_swrast_display_vtbl = {
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
.destroy_surface = dri2_wl_destroy_surface,
.create_image = dri2_fallback_create_image_khr,
- .swap_interval = dri2_wl_swap_interval,
.swap_buffers = dri2_wl_swrast_swap_buffers,
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index c5e3955c48..65fb117f08 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)
+ if (surf->SwapInterval != interval && drv->API.SwapInterval)
ret = drv->API.SwapInterval(drv, disp, surf, interval);
else
ret = EGL_TRUE;
More information about the mesa-commit
mailing list