Use glxbyteorder.h in server-side source files.

diff --git a/src/mesa/glapi/glX_proto_recv.py b/src/mesa/glapi/glX_proto_recv.py
index 527f6f10eef35bac2daa694453f304dc229fdf0e..20f75575cf1d8e13e1c5e42377b8eb3b3b0b4325 100644 (file)
--- a/src/mesa/glapi/glX_proto_recv.py
+++ b/src/mesa/glapi/glX_proto_recv.py
@@ -81,31 +81,12 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                print '#include <GL/gl.h>'
                print '#include <GL/glxproto.h>'
 
-
-               # FIXME: Since this block will require changes as other
-               # FIXME: platforms are added, it should probably be in a
-               # FIXME: header file that is not generated by a script.
-
-               if self.do_swap:
-                       print '#ifdef __linux__'
-                       print '#include <byteswap.h>'
-                       print '#elif defined(__OpenBSD__)'
-                       print '#include <sys/endian.h>'
-                       print '#define bswap_16 __swap16'
-                       print '#define bswap_32 __swap32'
-                       print '#define bswap_64 __swap64'
-                       print '#else'
-                       print '#include <sys/endian.h>'
-                       print '#define bswap_16 bswap16'
-                       print '#define bswap_32 bswap32'
-                       print '#define bswap_64 bswap64'
-                       print '#endif'
-
                print '#include <inttypes.h>'
                print '#include "indirect_size.h"'
                print '#include "indirect_size_get.h"'
                print '#include "indirect_dispatch.h"'
                print '#include "glxserver.h"'
+               print '#include "glxbyteorder.h"'
                print '#include "indirect_util.h"'
                print '#include "singlesize.h"'
                print '#include "glapitable.h"'

diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py
index 18bfa1b71bca6aa7ca866a95689a3a8a5a2607c0..2b9a643362282c30e57c4d8f34b17f4d93a66aca 100644 (file)
--- a/src/mesa/glapi/glX_proto_size.py
+++ b/src/mesa/glapi/glX_proto_size.py
@@ -447,17 +447,9 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
                print ''
                print '#include <GL/gl.h>'
                print '#include "glxserver.h"'
+               print '#include "glxbyteorder.h"'
                print '#include "indirect_size.h"'
                print '#include "indirect_reqsize.h"'
-               print ''
-               print '#if defined(linux)'
-               print '#  include <byteswap.h>'
-               print '#  define SWAP_32(v)  do { (v) = bswap_32(v); } while(0)'
-               print '#else'
-               print '#  include <X11/misc.h>'
-               print '#  define SWAP_32(v)  do { char tmp; swapl(&v, tmp); } while(0)'
-               print '#endif'
-               
                print ''
                print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'
                print ''
@@ -538,7 +530,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
                if fixup:
                        print '    if (swap) {'
                        for name in fixup:
-                               print '        SWAP_32( %s );' % (name)
+                               print '        %s = bswap_32(%s);' % (name, name)
                        print '    }'
 
                return