egl: Quit checking for a bug in old xcb when we require new xcb.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/configure.ac b/configure.ac
index 54f6ea20bdb18945e629aac4113665ca5f4b2a90..6c7a1929eb5022792f8271742f6b252ff6da1134 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1509,11 +1509,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 2be6d095931c89eda84bac246d964df0ee53e2cc..a56fc7818800eee310a2c80b2f7a18b513a5d664 100644 (file)
--- 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,