From: Brian Paul Date: Thu, 20 Oct 2005 21:12:35 +0000 (+0000) Subject: Disable the FASTCALL optimization because it still breaks server-side GLX. X-Git-Tag: 062012170305~21861 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8f86105d0df2ef14c9dd9fc193f8cd40b58fc00;p=profile%2Fivi%2Fmesa.git Disable the FASTCALL optimization because it still breaks server-side GLX. --- diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index 2a4db65..35be63f 100644 --- a/src/glx/x11/indirect.c +++ b/src/glx/x11/indirect.c @@ -39,11 +39,7 @@ #define __GLX_PAD(n) (((n) + 3) & ~3) -# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) -# define FASTCALL __attribute__((fastcall)) -# else -# define FASTCALL -# endif +#define FASTCALL # if defined(__GNUC__) # define NOINLINE __attribute__((noinline)) # else diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h index 1c45fa2..fd5cbf1 100644 --- a/src/glx/x11/indirect.h +++ b/src/glx/x11/indirect.h @@ -42,11 +42,7 @@ # else # define HIDDEN # endif -# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) -# define FASTCALL __attribute__((fastcall)) -# else -# define FASTCALL -# endif +#define FASTCALL # if defined(__GNUC__) # define NOINLINE __attribute__((noinline)) # else diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c index 79d57d5..aa5ed75 100644 --- a/src/glx/x11/indirect_size.c +++ b/src/glx/x11/indirect_size.c @@ -35,11 +35,7 @@ # define PURE # endif -# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) -# define FASTCALL __attribute__((fastcall)) -# else -# define FASTCALL -# endif +#define FASTCALL # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) # define INTERNAL __attribute__((visibility("internal"))) diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h index 9ba0bd6..c3f353d 100644 --- a/src/glx/x11/indirect_size.h +++ b/src/glx/x11/indirect_size.h @@ -42,11 +42,7 @@ # define PURE # endif -# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) -# define FASTCALL __attribute__((fastcall)) -# else -# define FASTCALL -# endif +#define FASTCALL # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) # define INTERNAL __attribute__((visibility("internal"))) diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py index 11b23b7..0cea268 100644 --- a/src/mesa/glapi/gl_XML.py +++ b/src/mesa/glapi/gl_XML.py @@ -194,11 +194,9 @@ class gl_print_base: """ self.undef_list.append("FASTCALL") - print """# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) -# define FASTCALL __attribute__((fastcall)) -# else -# define FASTCALL -# endif""" + # I've removed the previous code for __attribute__((fastcall)) + # because it breaks server-side GLX. (BrianP) + print "#define FASTCALL" return