[Mesa-dev] [PATCH 09/19] egl: Quit checking for a bug in old xcb when we require new xcb.

[Eric Anholt]

---
 configure.ac                        |    5 -----
 src/egl/drivers/dri2/platform_x11.c |    4 ----
 2 files changed, 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index b27cbb6..c9ec9c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1522,11 +1522,6 @@ for plat in $egl_platforms; do
 
 	x11)
 		PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 xcb-xfixes])
-		# workaround a bug in xcb-dri2 generated by xcb-proto 1.6
-		save_LIBS="$LIBS"
-		AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
-			     [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])
-		LIBS="$save_LIBS"
 		;;
 
 	drm)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 1934de9..b5485b0 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -543,11 +543,7 @@ dri2_connect(struct dri2_egl_display *dri2_dpy)
       dri2_strndup(driver_name,
 		   xcb_dri2_connect_driver_name_length (connect));
 
-#if XCB_DRI2_CONNECT_DEVICE_NAME_BROKEN
-   device_name = driver_name + ((connect->driver_name_length + 3) & ~3);
-#else
    device_name = xcb_dri2_connect_device_name (connect);
-#endif
 
    dri2_dpy->device_name =
       dri2_strndup(device_name,
-- 
1.7.10.4