From: Eric Anholt <eric@anholt.net>
Date: Tue, 25 Sep 2012 16:07:04 +0000 (-0700)
Subject: glx: Remove the last user of -DUSE_XCB.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc6fa4107643e153bb1c5831ca6aa1be10ef3b3a;p=mesa.git

glx: Remove the last user of -DUSE_XCB.

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

diff --git a/configure.ac b/configure.ac
index 45406dd433e..48ec4669d80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -823,10 +823,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 0e4b420fdb2..2cb0cf4ef8b 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)'