[Mesa-dev] [PATCH 04/19] glx: Remove the last user of -DUSE_XCB.

Eric Anholt eric at anholt.net
Tue Sep 25 19:50:02 PDT 2012


---
 configure.ac                         |    4 ----
 src/mapi/glapi/gen/glX_proto_send.py |    2 --
 2 files changed, 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ef2455b..6fc1820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -820,10 +820,6 @@ if test "x$enable_glx" = xyes -a "x$no_x" = xyes; then
     AC_MSG_ERROR([X11 development libraries needed for GLX])
 fi
 
-if test "x$enable_glx" = xyes; then
-    DEFINES="$DEFINES -DUSE_XCB"
-fi
-
 dnl Direct rendering or just indirect rendering
 case "$host_os" in
 gnu*)
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index 0e4b420..2cb0cf4 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -169,11 +169,9 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
 		print '#include "glapi.h"'
 		print '#include "glthread.h"'
 		print '#include <GL/glxproto.h>'
-		print '#ifdef USE_XCB'
 		print '#include <X11/Xlib-xcb.h>'
 		print '#include <xcb/xcb.h>'
 		print '#include <xcb/glx.h>'
-		print '#endif /* USE_XCB */'
 
 		print ''
 		print '#define __GLX_PAD(n) (((n) + 3) & ~3)'
-- 
1.7.10.4



More information about the mesa-dev mailing list