Module: Mesa
Branch: master
Commit: da3f7c127b4086eb50d1ba8ed6332fcf2431a85e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=da3f7c127b4086eb50d1ba8ed6332fcf2431a85e
Author: Eric Anholt <e...@anholt.net>
Date: Tue Sep 25 09:03:48 2012 -0700
egl: Quit checking for a bug in old xcb when we require new xcb.
Reviewed-by: Chad Versace <chad.vers...@linux.intel.com>
---
configure.ac | 5 -----
src/egl/drivers/dri2/platform_x11.c | 4 ----
2 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 54f6ea2..6c7a192 100644
--- 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 2be6d09..a56fc78 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,
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
