From: Chad Versace <chad.versace@linux.intel.com>
Date: Tue, 28 Jan 2014 00:42:10 +0000 (-0800)
Subject: egl/wl,x11: Call dri2_swap_interval() statically
X-Git-Tag: upstream/10.3~3063
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a218765478e5207f4337406d98865c6b5cf3784e;p=platform%2Fupstream%2Fmesa.git

egl/wl,x11: Call dri2_swap_interval() statically

Don't call it through the driver dispatch table. Just call it
statically.

This prepares for the EGL platform extensions.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index aea2793..6a75355 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -47,6 +47,10 @@ enum wl_drm_format_flags {
    HAS_RGB565 = 4,
 };
 
+static EGLBoolean
+dri2_wl_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
+                      EGLint interval);
+
 static void
 sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
 {
@@ -191,7 +195,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
                                  window, attrib_list);
 
    if (surf != NULL)
-      drv->API.SwapInterval(drv, disp, surf, dri2_dpy->default_swap_interval);
+      dri2_wl_swap_interval(drv, disp, surf, dri2_dpy->default_swap_interval);
 
    return surf;
 }
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index eb15650..ea871fd 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -41,6 +41,10 @@
 
 #include "egl_dri2.h"
 
+static EGLBoolean
+dri2_x11_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
+                       EGLint interval);
+
 static void
 swrastCreateDrawable(struct dri2_egl_display * dri2_dpy,
                      struct dri2_egl_surface * dri2_surf,
@@ -287,7 +291,7 @@ dri2_x11_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
       surf->SwapInterval = 1;
 
       /* Override that with a driconf-set value. */
-      drv->API.SwapInterval(drv, disp, surf, dri2_dpy->default_swap_interval);
+      dri2_x11_swap_interval(drv, disp, surf, dri2_dpy->default_swap_interval);
    }
 
    return surf;