st/egl_g3d: Always override flush_frontbuffer.

Instead of letting the native displays install their own version of
flush_frontbuffer, always override the callback with a version that
calls the flush_frontbuffer of the native surface.

1 files changed, 1 insertions, 18 deletions

diff --git a/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c b/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c
index 2192a1366d..f497d8c1c7 100644
--- a/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c
+++ b/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c
@@ -641,18 +641,8 @@ dri2_display_init_screen(struct native_display *ndpy)
    return TRUE;
 }
 
-static void
-dri2_display_flush_frontbuffer(void *dummy, struct pipe_surface *surf,
-                               void *context_private)
-{
-   /* TODO get native surface from context private, and remove the callback */
-   _eglLog(_EGL_WARNING, "flush_frontbuffer is not supplied");
-}
-
 struct native_display *
-x11_create_dri2_display(EGLNativeDisplayType dpy,
-                        struct drm_api *api,
-                        native_flush_frontbuffer flush_frontbuffer)
+x11_create_dri2_display(EGLNativeDisplayType dpy, struct drm_api *api)
 {
    struct dri2_display *dri2dpy;
 
@@ -689,13 +679,6 @@ x11_create_dri2_display(EGLNativeDisplayType dpy,
       return NULL;
    }
 
-   if (!flush_frontbuffer)
-      flush_frontbuffer = dri2_display_flush_frontbuffer;
-
-   dri2dpy->base.screen->flush_frontbuffer =
-      (void (*)(struct pipe_screen *, struct pipe_surface *, void *))
-      flush_frontbuffer;
-
    dri2dpy->base.destroy = dri2_display_destroy;
    dri2dpy->base.get_configs = dri2_display_get_configs;
    dri2dpy->base.create_context = dri2_display_create_context;