summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-10-20 21:12:35 +0000
committerBrian Paul <[email protected]>2005-10-20 21:12:35 +0000
commitc8f86105d0df2ef14c9dd9fc193f8cd40b58fc00 (patch)
tree18531607f7472da776e66a46bd4d62e7bc42e5bd /src
parent6f980dbf21893af4e7413dbb0373fb79761294c7 (diff)
Disable the FASTCALL optimization because it still breaks server-side GLX.
Diffstat (limited to 'src')
-rw-r--r--src/glx/x11/indirect.c6
-rw-r--r--src/glx/x11/indirect.h6
-rw-r--r--src/glx/x11/indirect_size.c6
-rw-r--r--src/glx/x11/indirect_size.h6
-rw-r--r--src/mesa/glapi/gl_XML.py8
5 files changed, 7 insertions, 25 deletions
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 2a4db6578a7..35be63f36ec 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 1c45fa28a4c..fd5cbf1edb1 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 79d57d55b68..aa5ed752a59 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 9ba0bd69075..c3f353dbf4c 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 11b23b7a867..0cea2687771 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