Module: Mesa
Branch: master
Commit: dc6fa4107643e153bb1c5831ca6aa1be10ef3b3a
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc6fa4107643e153bb1c5831ca6aa1be10ef3b3a

Author: Eric Anholt <e...@anholt.net>
Date:   Tue Sep 25 09:07:04 2012 -0700

glx: Remove the last user of -DUSE_XCB.

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

---

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

diff --git a/configure.ac b/configure.ac
index 45406dd..48ec466 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 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)'

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to