egl_dri2: Split out x11 platform code

1 files changed, 8 insertions, 825 deletions

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 92fc9df54a..61df122ade 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -36,10 +36,6 @@
 #include <xf86drm.h>
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
-#include <xcb/xcb.h>
-#include <xcb/dri2.h>
-#include <xcb/xfixes.h>
-#include <X11/Xlib-xcb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -47,81 +43,7 @@
 #include <libudev.h>
 #endif
 
-#include "eglconfig.h"
-#include "eglcontext.h"
-#include "egldisplay.h"
-#include "egldriver.h"
-#include "eglcurrent.h"
-#include "egllog.h"
-#include "eglsurface.h"
-#include "eglimage.h"
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
-struct dri2_egl_driver
-{
-   _EGLDriver base;
-
-   void *handle;
-   _EGLProc (*get_proc_address)(const char *procname);
-   void (*glFlush)(void);
-};
-
-struct dri2_egl_display
-{
-   xcb_connection_t         *conn;
-   int                       dri2_major;
-   int                       dri2_minor;
-   __DRIscreen              *dri_screen;
-   const __DRIconfig       **driver_configs;
-   void                     *driver;
-   __DRIcoreExtension       *core;
-   __DRIdri2Extension       *dri2;
-   __DRI2flushExtension     *flush;
-   __DRItexBufferExtension  *tex_buffer;
-   __DRIimageExtension      *image;
-   int                       fd;
-
-   char                     *device_name;
-   char                     *driver_name;
-
-   __DRIdri2LoaderExtension  loader_extension;
-   const __DRIextension     *extensions[3];
-};
-
-struct dri2_egl_context
-{
-   _EGLContext   base;
-   __DRIcontext *dri_context;
-};
-
-struct dri2_egl_surface
-{
-   _EGLSurface          base;
-   __DRIdrawable       *dri_drawable;
-   xcb_drawable_t       drawable;
-   __DRIbuffer          buffers[5];
-   int                  buffer_count;
-   xcb_xfixes_region_t  region;
-   int                  have_fake_front;
-   int                  swap_interval;
-};
-
-struct dri2_egl_config
-{
-   _EGLConfig         base;
-   const __DRIconfig *dri_config;
-};
-
-struct dri2_egl_image
-{
-   _EGLImage   base;
-   __DRIimage *dri_image;
-};
-
-/* standard typecasts */
-_EGL_DRIVER_STANDARD_TYPECASTS(dri2_egl)
-_EGL_DRIVER_TYPECAST(dri2_egl_image, _EGLImage, obj)
+#include "egl_dri2.h"
 
 static const __DRIuseInvalidateExtension use_invalidate = {
    { __DRI_USE_INVALIDATE, 1 }
@@ -178,7 +100,7 @@ EGLint dri2_to_egl_attribute_map[] = {
    EGL_Y_INVERTED_NOK,		/* __DRI_ATTRIB_YINVERTED */
 };
 
-static struct dri2_egl_config *
+struct dri2_egl_config *
 dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
 		int depth, EGLint surface_type)
 {
@@ -279,102 +201,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
    return conf;
 }
 
-/**
- * Process list of buffer received from the server
- *
- * Processes the list of buffers received in a reply from the server to either
- * \c DRI2GetBuffers or \c DRI2GetBuffersWithFormat.
- */
-static void
-dri2_process_buffers(struct dri2_egl_surface *dri2_surf,
-		     xcb_dri2_dri2_buffer_t *buffers, unsigned count)
-{
-   struct dri2_egl_display *dri2_dpy =
-      dri2_egl_display(dri2_surf->base.Resource.Display);
-   xcb_rectangle_t rectangle;
-   unsigned i;
-
-   dri2_surf->buffer_count = count;
-   dri2_surf->have_fake_front = 0;
-
-   /* This assumes the DRI2 buffer attachment tokens matches the
-    * __DRIbuffer tokens. */
-   for (i = 0; i < count; i++) {
-      dri2_surf->buffers[i].attachment = buffers[i].attachment;
-      dri2_surf->buffers[i].name = buffers[i].name;
-      dri2_surf->buffers[i].pitch = buffers[i].pitch;
-      dri2_surf->buffers[i].cpp = buffers[i].cpp;
-      dri2_surf->buffers[i].flags = buffers[i].flags;
-
-      /* We only use the DRI drivers single buffer configs.  This
-       * means that if we try to render to a window, DRI2 will give us
-       * the fake front buffer, which we'll use as a back buffer.
-       * Note that EGL doesn't require that several clients rendering
-       * to the same window must see the same aux buffers. */
-      if (dri2_surf->buffers[i].attachment == __DRI_BUFFER_FAKE_FRONT_LEFT)
-         dri2_surf->have_fake_front = 1;
-   }
-
-   if (dri2_surf->region != XCB_NONE)
-      xcb_xfixes_destroy_region(dri2_dpy->conn, dri2_surf->region);
-
-   rectangle.x = 0;
-   rectangle.y = 0;
-   rectangle.width = dri2_surf->base.Width;
-   rectangle.height = dri2_surf->base.Height;
-   dri2_surf->region = xcb_generate_id(dri2_dpy->conn);
-   xcb_xfixes_create_region(dri2_dpy->conn, dri2_surf->region, 1, &rectangle);
-}
-
-static __DRIbuffer *
-dri2_get_buffers(__DRIdrawable * driDrawable,
-		int *width, int *height,
-		unsigned int *attachments, int count,
-		int *out_count, void *loaderPrivate)
-{
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-   struct dri2_egl_display *dri2_dpy =
-      dri2_egl_display(dri2_surf->base.Resource.Display);
-   xcb_dri2_dri2_buffer_t *buffers;
-   xcb_dri2_get_buffers_reply_t *reply;
-   xcb_dri2_get_buffers_cookie_t cookie;
-
-   (void) driDrawable;
-
-   cookie = xcb_dri2_get_buffers_unchecked (dri2_dpy->conn,
-					    dri2_surf->drawable,
-					    count, count, attachments);
-   reply = xcb_dri2_get_buffers_reply (dri2_dpy->conn, cookie, NULL);
-   buffers = xcb_dri2_get_buffers_buffers (reply);
-   if (buffers == NULL)
-      return NULL;
-
-   *out_count = reply->count;
-   dri2_surf->base.Width = *width = reply->width;
-   dri2_surf->base.Height = *height = reply->height;
-   dri2_process_buffers(dri2_surf, buffers, *out_count);		       
-
-   free(reply);
-
-   return dri2_surf->buffers;
-}
-
-static void
-dri2_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
-{
-   (void) driDrawable;
-
-   /* FIXME: Does EGL support front buffer rendering at all? */
-
-#if 0
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-
-   dri2WaitGL(dri2_surf);
-#else
-   (void) loaderPrivate;
-#endif
-}
-
 static __DRIimage *
 dri2_lookup_egl_image(__DRIscreen *screen, void *image, void *data)
 {
@@ -395,49 +221,11 @@ dri2_lookup_egl_image(__DRIscreen *screen, void *image, void *data)
    return dri2_img->dri_image;
 }
 
-static const __DRIimageLookupExtension image_lookup_extension = {
+const __DRIimageLookupExtension image_lookup_extension = {
    { __DRI_IMAGE_LOOKUP, 1 },
    dri2_lookup_egl_image
 };
 
-static __DRIbuffer *
-dri2_get_buffers_with_format(__DRIdrawable * driDrawable,
-			     int *width, int *height,
-			     unsigned int *attachments, int count,
-			     int *out_count, void *loaderPrivate)
-{
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-   struct dri2_egl_display *dri2_dpy =
-      dri2_egl_display(dri2_surf->base.Resource.Display);
-   xcb_dri2_dri2_buffer_t *buffers;
-   xcb_dri2_get_buffers_with_format_reply_t *reply;
-   xcb_dri2_get_buffers_with_format_cookie_t cookie;
-   xcb_dri2_attach_format_t *format_attachments;
-
-   (void) driDrawable;
-
-   format_attachments = (xcb_dri2_attach_format_t *) attachments;
-   cookie = xcb_dri2_get_buffers_with_format_unchecked (dri2_dpy->conn,
-							dri2_surf->drawable,
-							count, count,
-							format_attachments);
-
-   reply = xcb_dri2_get_buffers_with_format_reply (dri2_dpy->conn,
-						   cookie, NULL);
-   if (reply == NULL)
-      return NULL;
-
-   buffers = xcb_dri2_get_buffers_with_format_buffers (reply);
-   dri2_surf->base.Width = *width = reply->width;
-   dri2_surf->base.Height = *height = reply->height;
-   *out_count = reply->count;
-   dri2_process_buffers(dri2_surf, buffers, *out_count);		       
-
-   free(reply);
-
-   return dri2_surf->buffers;
-}
-
 static const char dri_driver_path[] = DEFAULT_DRIVER_DIR;
 
 struct dri2_extension_match {
@@ -492,180 +280,7 @@ dri2_bind_extensions(struct dri2_egl_display *dri2_dpy,
    return ret;
 }
 
-static char *
-dri2_strndup(const char *s, int length)
-{
-   char *d;
-
-   d = malloc(length + 1);
-   if (d == NULL)
-      return NULL;
-
-   memcpy(d, s, length);
-   d[length] = '\0';
-
-   return d;
-}
-
-static EGLBoolean
-dri2_connect(struct dri2_egl_display *dri2_dpy)
-{
-   xcb_xfixes_query_version_reply_t *xfixes_query;
-   xcb_xfixes_query_version_cookie_t xfixes_query_cookie;
-   xcb_dri2_query_version_reply_t *dri2_query;
-   xcb_dri2_query_version_cookie_t dri2_query_cookie;
-   xcb_dri2_connect_reply_t *connect;
-   xcb_dri2_connect_cookie_t connect_cookie;
-   xcb_generic_error_t *error;
-   xcb_screen_iterator_t s;
-
-   xcb_prefetch_extension_data (dri2_dpy->conn, &xcb_xfixes_id);
-   xcb_prefetch_extension_data (dri2_dpy->conn, &xcb_dri2_id);
-
-   xfixes_query_cookie = xcb_xfixes_query_version(dri2_dpy->conn,
-						  XCB_XFIXES_MAJOR_VERSION,
-						  XCB_XFIXES_MINOR_VERSION);
-   
-   dri2_query_cookie = xcb_dri2_query_version (dri2_dpy->conn,
-					       XCB_DRI2_MAJOR_VERSION,
-					       XCB_DRI2_MINOR_VERSION);
-
-   s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
-   connect_cookie = xcb_dri2_connect_unchecked (dri2_dpy->conn,
-						s.data->root,
-						XCB_DRI2_DRIVER_TYPE_DRI);
-   
-   xfixes_query =
-      xcb_xfixes_query_version_reply (dri2_dpy->conn,
-				      xfixes_query_cookie, &error);
-   if (xfixes_query == NULL ||
-       error != NULL || xfixes_query->major_version < 2) {
-      _eglLog(_EGL_FATAL, "DRI2: failed to query xfixes version");
-      free(error);
-      return EGL_FALSE;
-   }
-   free(xfixes_query);
-
-   dri2_query =
-      xcb_dri2_query_version_reply (dri2_dpy->conn, dri2_query_cookie, &error);
-   if (dri2_query == NULL || error != NULL) {
-      _eglLog(_EGL_FATAL, "DRI2: failed to query version");
-      free(error);
-      return EGL_FALSE;
-   }
-   dri2_dpy->dri2_major = dri2_query->major_version;
-   dri2_dpy->dri2_minor = dri2_query->minor_version;
-   free(dri2_query);
-
-   connect = xcb_dri2_connect_reply (dri2_dpy->conn, connect_cookie, NULL);
-   if (connect == NULL ||
-       connect->driver_name_length + connect->device_name_length == 0) {
-      _eglLog(_EGL_FATAL, "DRI2: failed to authenticate");
-      return EGL_FALSE;
-   }
-
-   dri2_dpy->device_name =
-      dri2_strndup(xcb_dri2_connect_device_name (connect),
-		   xcb_dri2_connect_device_name_length (connect));
-		   
-   dri2_dpy->driver_name =
-      dri2_strndup(xcb_dri2_connect_driver_name (connect),
-		   xcb_dri2_connect_driver_name_length (connect));
-
-   if (dri2_dpy->device_name == NULL || dri2_dpy->driver_name == NULL) {
-      free(dri2_dpy->device_name);
-      free(dri2_dpy->driver_name);
-      free(connect);
-      return EGL_FALSE;
-   }
-   free(connect);
-
-   return EGL_TRUE;
-}
-
-static EGLBoolean
-dri2_authenticate(struct dri2_egl_display *dri2_dpy)
-{
-   xcb_dri2_authenticate_reply_t *authenticate;
-   xcb_dri2_authenticate_cookie_t authenticate_cookie;
-   xcb_screen_iterator_t s;
-   drm_magic_t magic;
-
-   if (drmGetMagic(dri2_dpy->fd, &magic)) {
-      _eglLog(_EGL_FATAL, "DRI2: failed to get drm magic");
-      return EGL_FALSE;
-   }
-
-   s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
-   authenticate_cookie =
-      xcb_dri2_authenticate_unchecked(dri2_dpy->conn, s.data->root, magic);
-   authenticate =
-      xcb_dri2_authenticate_reply(dri2_dpy->conn, authenticate_cookie, NULL);
-   if (authenticate == NULL || !authenticate->authenticated) {
-      _eglLog(_EGL_FATAL, "DRI2: failed to authenticate");
-      free(authenticate);
-      return EGL_FALSE;
-   }
-
-   free(authenticate);
-
-   return EGL_TRUE;
-}
-
-static EGLBoolean
-dri2_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
-			     _EGLDisplay *disp)
-{
-   xcb_screen_iterator_t s;
-   xcb_depth_iterator_t d;
-   xcb_visualtype_t *visuals;
-   int i, j, id;
-   struct dri2_egl_config *conf;
-   EGLint surface_type;
-
-   s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
-   d = xcb_screen_allowed_depths_iterator(s.data);
-   id = 1;
-
-   surface_type =
-      EGL_WINDOW_BIT |
-      EGL_PIXMAP_BIT |
-      EGL_PBUFFER_BIT |
-      EGL_SWAP_BEHAVIOR_PRESERVED_BIT;
-
-   while (d.rem > 0) {
-      EGLBoolean class_added[6] = { 0, };
-
-      visuals = xcb_depth_visuals(d.data);
-      for (i = 0; i < xcb_depth_visuals_length(d.data); i++) {
-	 if (class_added[visuals[i]._class])
-	    continue;
-
-	 class_added[visuals[i]._class] = EGL_TRUE;
-	 for (j = 0; dri2_dpy->driver_configs[j]; j++) {
-	    conf = dri2_add_config(disp, dri2_dpy->driver_configs[j],
-				   id++, d.data->depth, surface_type);
-	    if (conf == NULL)
-	       continue;
-	    _eglSetConfigKey(&conf->base,
-			     EGL_NATIVE_VISUAL_ID, visuals[i].visual_id);
-	    _eglSetConfigKey(&conf->base,
-			     EGL_NATIVE_VISUAL_TYPE, visuals[i]._class);
-	 }
-      }
-
-      xcb_depth_next(&d);      
-   }
-
-   if (!_eglGetArraySize(disp->Configs)) {
-      _eglLog(_EGL_WARNING, "DRI2: failed to create any config");
-      return EGL_FALSE;
-   }
-
-   return EGL_TRUE;
-}
-
-static EGLBoolean
+EGLBoolean
 dri2_load_driver(_EGLDisplay *disp)
 {
    struct dri2_egl_display *dri2_dpy = disp->DriverData;
@@ -727,7 +342,7 @@ dri2_load_driver(_EGLDisplay *disp)
    return EGL_TRUE;
 }
 
-static EGLBoolean
+EGLBoolean
 dri2_create_screen(_EGLDisplay *disp)
 {
    const __DRIextension **extensions;
@@ -775,107 +390,6 @@ dri2_create_screen(_EGLDisplay *disp)
    return EGL_FALSE;
 }
 
-static EGLBoolean
-dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp)
-{
-   struct dri2_egl_display *dri2_dpy;
-
-   (void) drv;
-
-   dri2_dpy = malloc(sizeof *dri2_dpy);
-   if (!dri2_dpy)
-      return _eglError(EGL_BAD_ALLOC, "eglInitialize");
-
-   disp->DriverData = (void *) dri2_dpy;
-   if (disp->PlatformDisplay == NULL) {
-      dri2_dpy->conn = xcb_connect(0, 0);
-   } else {
-      dri2_dpy->conn = XGetXCBConnection((Display *) disp->PlatformDisplay);
-   }
-
-   if (xcb_connection_has_error(dri2_dpy->conn)) {
-      _eglLog(_EGL_WARNING, "DRI2: xcb_connect failed");
-      goto cleanup_dpy;
-   }
-
-   if (dri2_dpy->conn) {
-      if (!dri2_connect(dri2_dpy))
-	 goto cleanup_conn;
-   }
-
-   if (!dri2_load_driver(disp))
-      goto cleanup_conn;
-
-   dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
-   if (dri2_dpy->fd == -1) {
-      _eglLog(_EGL_WARNING,
-	      "DRI2: could not open %s (%s)", dri2_dpy->device_name,
-              strerror(errno));
-      goto cleanup_driver;
-   }
-
-   if (dri2_dpy->conn) {
-      if (!dri2_authenticate(dri2_dpy))
-	 goto cleanup_fd;
-   }
-
-   if (dri2_dpy->dri2_minor >= 1) {
-      dri2_dpy->loader_extension.base.name = __DRI_DRI2_LOADER;
-      dri2_dpy->loader_extension.base.version = 3;
-      dri2_dpy->loader_extension.getBuffers = dri2_get_buffers;
-      dri2_dpy->loader_extension.flushFrontBuffer = dri2_flush_front_buffer;
-      dri2_dpy->loader_extension.getBuffersWithFormat =
-	 dri2_get_buffers_with_format;
-   } else {
-      dri2_dpy->loader_extension.base.name = __DRI_DRI2_LOADER;
-      dri2_dpy->loader_extension.base.version = 2;
-      dri2_dpy->loader_extension.getBuffers = dri2_get_buffers;
-      dri2_dpy->loader_extension.flushFrontBuffer = dri2_flush_front_buffer;
-      dri2_dpy->loader_extension.getBuffersWithFormat = NULL;
-   }
-      
-   dri2_dpy->extensions[0] = &dri2_dpy->loader_extension.base;
-   dri2_dpy->extensions[1] = &image_lookup_extension.base;
-   dri2_dpy->extensions[2] = NULL;
-
-   if (!dri2_create_screen(disp))
-      goto cleanup_fd;
-
-   if (dri2_dpy->conn) {
-      if (!dri2_add_configs_for_visuals(dri2_dpy, disp))
-	 goto cleanup_configs;
-   }
-
-   disp->Extensions.MESA_drm_image = EGL_TRUE;
-   disp->Extensions.KHR_image_base = EGL_TRUE;
-   disp->Extensions.KHR_image_pixmap = EGL_TRUE;
-   disp->Extensions.KHR_gl_renderbuffer_image = EGL_TRUE;
-   disp->Extensions.KHR_gl_texture_2D_image = EGL_TRUE;
-   disp->Extensions.NOK_swap_region = EGL_TRUE;
-   disp->Extensions.NOK_texture_from_pixmap = EGL_TRUE;
-
-   /* we're supporting EGL 1.4 */
-   disp->VersionMajor = 1;
-   disp->VersionMinor = 4;
-
-   return EGL_TRUE;
-
- cleanup_configs:
-   _eglCleanupDisplay(disp);
-   dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
- cleanup_fd:
-   close(dri2_dpy->fd);
- cleanup_driver:
-   dlclose(dri2_dpy->driver);
- cleanup_conn:
-   if (disp->PlatformDisplay == NULL)
-      xcb_disconnect(dri2_dpy->conn);
- cleanup_dpy:
-   free(dri2_dpy);
-
-   return EGL_FALSE;
-}
-
 #ifdef HAVE_LIBUDEV
 
 struct dri2_driver_map {
@@ -1597,29 +1111,6 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
    return NULL;
 }
 
-static EGLBoolean
-dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
-{
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
-
-   (void) drv;
-
-   if (!_eglPutSurface(surf))
-      return EGL_TRUE;
-
-   (*dri2_dpy->core->destroyDrawable)(dri2_surf->dri_drawable);
-   
-   xcb_dri2_destroy_drawable (dri2_dpy->conn, dri2_surf->drawable);
-
-   if (surf->Type == EGL_PBUFFER_BIT)
-      xcb_free_pixmap (dri2_dpy->conn, dri2_surf->drawable);
-
-   free(surf);
-
-   return EGL_TRUE;
-}
-
 /**
  * Called via eglMakeCurrent(), drv->API.MakeCurrent().
  */
@@ -1651,8 +1142,8 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf,
 
    if ((cctx == NULL && ddraw == NULL && rdraw == NULL) ||
        dri2_dpy->core->bindContext(cctx, ddraw, rdraw)) {
-      dri2_destroy_surface(drv, disp, old_dsurf);
-      dri2_destroy_surface(drv, disp, old_rsurf);
+      drv->API.DestroySurface(drv, disp, old_dsurf);
+      drv->API.DestroySurface(drv, disp, old_rsurf);
       if (old_ctx) {
          /* unbind the old context only when there is no new context bound */
          if (!ctx) {
@@ -1683,190 +1174,6 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf,
    }
 }
 
-/**
- * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
- */
-static _EGLSurface *
-dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
-		    _EGLConfig *conf, EGLNativeWindowType window,
-		    const EGLint *attrib_list)
-{
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
-   struct dri2_egl_surface *dri2_surf;
-   xcb_get_geometry_cookie_t cookie;
-   xcb_get_geometry_reply_t *reply;
-   xcb_screen_iterator_t s;
-   xcb_generic_error_t *error;
-
-   (void) drv;
-
-   dri2_surf = malloc(sizeof *dri2_surf);
-   if (!dri2_surf) {
-      _eglError(EGL_BAD_ALLOC, "dri2_create_surface");
-      return NULL;
-   }
-   
-   if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list))
-      goto cleanup_surf;
-
-   dri2_surf->region = XCB_NONE;
-   if (type == EGL_PBUFFER_BIT) {
-      dri2_surf->drawable = xcb_generate_id(dri2_dpy->conn);
-      s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
-      xcb_create_pixmap(dri2_dpy->conn, conf->BufferSize,
-			dri2_surf->drawable, s.data->root,
-			dri2_surf->base.Width, dri2_surf->base.Height);
-   } else {
-      dri2_surf->drawable = window;
-   }
-
-   dri2_surf->dri_drawable = 
-      (*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
-					    dri2_conf->dri_config, dri2_surf);
-   if (dri2_surf->dri_drawable == NULL) {
-      _eglError(EGL_BAD_ALLOC, "dri2->createNewDrawable");
-      goto cleanup_pixmap;
-   }
-
-   xcb_dri2_create_drawable (dri2_dpy->conn, dri2_surf->drawable);
-
-   if (type != EGL_PBUFFER_BIT) {
-      cookie = xcb_get_geometry (dri2_dpy->conn, dri2_surf->drawable);
-      reply = xcb_get_geometry_reply (dri2_dpy->conn, cookie, &error);
-      if (reply == NULL || error != NULL) {
-	 _eglError(EGL_BAD_ALLOC, "xcb_get_geometry");
-	 free(error);
-	 goto cleanup_dri_drawable;
-      }
-
-      dri2_surf->base.Width = reply->width;
-      dri2_surf->base.Height = reply->height;
-      free(reply);
-   }
-
-   return &dri2_surf->base;
-
- cleanup_dri_drawable:
-   dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable);
- cleanup_pixmap:
-   if (type == EGL_PBUFFER_BIT)
-      xcb_free_pixmap(dri2_dpy->conn, dri2_surf->drawable);
- cleanup_surf:
-   free(dri2_surf);
-
-   return NULL;
-}
-
-/**
- * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
- */
-static _EGLSurface *
-dri2_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
-			   _EGLConfig *conf, EGLNativeWindowType window,
-			   const EGLint *attrib_list)
-{
-   return dri2_create_surface(drv, disp, EGL_WINDOW_BIT, conf,
-			      window, attrib_list);
-}
-
-static _EGLSurface *
-dri2_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp,
-			   _EGLConfig *conf, EGLNativePixmapType pixmap,
-			   const EGLint *attrib_list)
-{
-   return dri2_create_surface(drv, disp, EGL_PIXMAP_BIT, conf,
-			      pixmap, attrib_list);
-}
-
-static _EGLSurface *
-dri2_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp,
-			    _EGLConfig *conf, const EGLint *attrib_list)
-{
-   return dri2_create_surface(drv, disp, EGL_PBUFFER_BIT, conf,
-			      XCB_WINDOW_NONE, attrib_list);
-}
-
-static EGLBoolean
-dri2_copy_region(_EGLDriver *drv, _EGLDisplay *disp,
-		 _EGLSurface *draw, xcb_xfixes_region_t region)
-{
-   struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv);
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
-   _EGLContext *ctx;
-   xcb_dri2_copy_region_cookie_t cookie;
-
-   if (dri2_drv->glFlush) {
-      ctx = _eglGetCurrentContext();
-      if (ctx && ctx->DrawSurface == &dri2_surf->base)
-         dri2_drv->glFlush();
-   }
-
-   (*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
-
-#if 0
-   /* FIXME: Add support for dri swapbuffers, that'll give us swap
-    * interval and page flipping (at least for fullscreen windows) as
-    * well as the page flip event.  Unless surface->SwapBehavior is
-    * EGL_BUFFER_PRESERVED. */
-#if __DRI2_FLUSH_VERSION >= 2
-   if (pdraw->psc->f)
-      (*pdraw->psc->f->flushInvalidate)(pdraw->driDrawable);
-#endif
-#endif
-
-   if (!dri2_surf->have_fake_front)
-      return EGL_TRUE;
-
-   cookie = xcb_dri2_copy_region_unchecked(dri2_dpy->conn,
-					   dri2_surf->drawable,
-					   region,
-					   XCB_DRI2_ATTACHMENT_BUFFER_FRONT_LEFT,
-					   XCB_DRI2_ATTACHMENT_BUFFER_FAKE_FRONT_LEFT);
-   free(xcb_dri2_copy_region_reply(dri2_dpy->conn, cookie, NULL));
-
-   return EGL_TRUE;
-}
-
-static EGLBoolean
-dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
-{
-   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
-
-   return dri2_copy_region(drv, disp, draw, dri2_surf->region);
-}
-
-static EGLBoolean
-dri2_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw,
-			 EGLint numRects, const EGLint *rects)
-{
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
-   EGLBoolean ret;
-   xcb_xfixes_region_t region;
-   xcb_rectangle_t rectangles[16];
-   int i;
-
-   if (numRects > (int)ARRAY_SIZE(rectangles))
-      return dri2_copy_region(drv, disp, draw, dri2_surf->region);
-
-   /* FIXME: Invert y here? */
-   for (i = 0; i < numRects; i++) {
-      rectangles[i].x = rects[i * 4];
-      rectangles[i].y = rects[i * 4 + 1];
-      rectangles[i].width = rects[i * 4 + 2];
-      rectangles[i].height = rects[i * 4 + 3];
-   }
-
-   region = xcb_generate_id(dri2_dpy->conn);
-   xcb_xfixes_create_region(dri2_dpy->conn, region, numRects, rectangles);
-   ret = dri2_copy_region(drv, disp, draw, region);
-   xcb_xfixes_destroy_region(dri2_dpy->conn, region);
-
-   return ret;
-}
-
 /*
  * Called from eglGetProcAddress() via drv->API.GetProcAddress().
  */
@@ -1908,33 +1215,6 @@ dri2_wait_native(_EGLDriver *drv, _EGLDisplay *disp, EGLint engine)
 }
 
 static EGLBoolean
-dri2_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
-		  EGLNativePixmapType target)
-{
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
-   xcb_gcontext_t gc;
-
-   (void) drv;
-
-   (*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
-
-   gc = xcb_generate_id(dri2_dpy->conn);
-   xcb_create_gc(dri2_dpy->conn, gc, target, 0, NULL);
-   xcb_copy_area(dri2_dpy->conn,
-		  dri2_surf->drawable,
-		  target,
-		  gc,
-		  0, 0,
-		  0, 0,
-		  dri2_surf->base.Width,
-		  dri2_surf->base.Height);
-   xcb_free_gc(dri2_dpy->conn, gc);
-
-   return EGL_TRUE;
-}
-
-static EGLBoolean
 dri2_bind_tex_image(_EGLDriver *drv,
 		    _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
 {
@@ -2010,94 +1290,6 @@ dri2_release_tex_image(_EGLDriver *drv,
 }
 
 static _EGLImage *
-dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
-			     EGLClientBuffer buffer, const EGLint *attr_list)
-{
-   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
-   struct dri2_egl_image *dri2_img;
-   unsigned int attachments[1];
-   xcb_drawable_t drawable;
-   xcb_dri2_get_buffers_cookie_t buffers_cookie;
-   xcb_dri2_get_buffers_reply_t *buffers_reply;
-   xcb_dri2_dri2_buffer_t *buffers;
-   xcb_get_geometry_cookie_t geometry_cookie;
-   xcb_get_geometry_reply_t *geometry_reply;
-   xcb_generic_error_t *error;
-   int stride, format;
-
-   (void) ctx;
-
-   drawable = (xcb_drawable_t) buffer;
-   xcb_dri2_create_drawable (dri2_dpy->conn, drawable);
-   attachments[0] = XCB_DRI2_ATTACHMENT_BUFFER_FRONT_LEFT;
-   buffers_cookie =
-      xcb_dri2_get_buffers_unchecked (dri2_dpy->conn,
-				      drawable, 1, 1, attachments);
-   geometry_cookie = xcb_get_geometry (dri2_dpy->conn, drawable);
-   buffers_reply = xcb_dri2_get_buffers_reply (dri2_dpy->conn,
-					       buffers_cookie, NULL);
-   buffers = xcb_dri2_get_buffers_buffers (buffers_reply);
-   if (buffers == NULL) {
-      return NULL;
-   }
-
-   geometry_reply = xcb_get_geometry_reply (dri2_dpy->conn,
-					    geometry_cookie, &error);
-   if (geometry_reply == NULL || error != NULL) {
-      _eglError(EGL_BAD_ALLOC, "xcb_get_geometry");
-      free(error);
-      free(buffers_reply);
-   }
-
-   switch (geometry_reply->depth) {
-   case 16:
-      format = __DRI_IMAGE_FORMAT_RGB565;
-      break;
-   case 24:
-      format = __DRI_IMAGE_FORMAT_XRGB8888;
-      break;
-   case 32:
-      format = __DRI_IMAGE_FORMAT_ARGB8888;
-      break;
-   default:
-      _eglError(EGL_BAD_PARAMETER,
-		"dri2_create_image_khr: unsupported pixmap depth");
-      free(buffers_reply);
-      free(geometry_reply);
-      return NULL;
-   }
-
-   dri2_img = malloc(sizeof *dri2_img);
-   if (!dri2_img) {
-      free(buffers_reply);
-      free(geometry_reply);
-      _eglError(EGL_BAD_ALLOC, "dri2_create_image_khr");
-      return EGL_NO_IMAGE_KHR;
-   }
-
-   if (!_eglInitImage(&dri2_img->base, disp)) {
-      free(buffers_reply);
-      free(geometry_reply);
-      return EGL_NO_IMAGE_KHR;
-   }
-
-   stride = buffers[0].pitch / buffers[0].cpp;
-   dri2_img->dri_image =
-      dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen,
-					   buffers_reply->width,
-					   buffers_reply->height,
-					   format,
-					   buffers[0].name,
-					   stride,
-					   dri2_img);
-
-   free(buffers_reply);
-   free(geometry_reply);
-
-   return &dri2_img->base;
-}
-
-static _EGLImage *
 dri2_create_image_khr_renderbuffer(_EGLDisplay *disp, _EGLContext *ctx,
 				   EGLClientBuffer buffer,
 				   const EGLint *attr_list)
@@ -2192,7 +1384,7 @@ dri2_create_image_mesa_drm_buffer(_EGLDisplay *disp, _EGLContext *ctx,
    return &dri2_img->base;
 }
 
-static _EGLImage *
+_EGLImage *
 dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
 		      _EGLContext *ctx, EGLenum target,
 		      EGLClientBuffer buffer, const EGLint *attr_list)
@@ -2200,8 +1392,6 @@ dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
    (void) drv;
 
    switch (target) {
-   case EGL_NATIVE_PIXMAP_KHR:
-      return dri2_create_image_khr_pixmap(disp, ctx, buffer, attr_list);
    case EGL_GL_RENDERBUFFER_KHR:
       return dri2_create_image_khr_renderbuffer(disp, ctx, buffer, attr_list);
    case EGL_DRM_BUFFER_MESA:
@@ -2410,20 +1600,13 @@ _EGL_MAIN(const char *args)
    dri2_drv->base.API.Terminate = dri2_terminate;
    dri2_drv->base.API.CreateContext = dri2_create_context;
    dri2_drv->base.API.MakeCurrent = dri2_make_current;
-   dri2_drv->base.API.CreateWindowSurface = dri2_create_window_surface;
-   dri2_drv->base.API.CreatePixmapSurface = dri2_create_pixmap_surface;
-   dri2_drv->base.API.CreatePbufferSurface = dri2_create_pbuffer_surface;
-   dri2_drv->base.API.DestroySurface = dri2_destroy_surface;
-   dri2_drv->base.API.SwapBuffers = dri2_swap_buffers;
    dri2_drv->base.API.GetProcAddress = dri2_get_proc_address;
    dri2_drv->base.API.WaitClient = dri2_wait_client;
    dri2_drv->base.API.WaitNative = dri2_wait_native;
-   dri2_drv->base.API.CopyBuffers = dri2_copy_buffers;
    dri2_drv->base.API.BindTexImage = dri2_bind_tex_image;
    dri2_drv->base.API.ReleaseTexImage = dri2_release_tex_image;
    dri2_drv->base.API.CreateImageKHR = dri2_create_image_khr;
    dri2_drv->base.API.DestroyImageKHR = dri2_destroy_image_khr;
-   dri2_drv->base.API.SwapBuffersRegionNOK = dri2_swap_buffers_region;
    dri2_drv->base.API.CreateDRMImageMESA = dri2_create_drm_image_mesa;
    dri2_drv->base.API.ExportDRMImageMESA = dri2_export_drm_image_mesa;