fixed pointer arithmetic error in glCopyPixels

[mesa.git] / src / mesa / main / dispatch.c

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 0b9b17effc08e875ddd0892600d290910aab772d..0ed24afd30a31165f0db8b7894e94b3540eeb1e6 100644 (file)
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -1,8 +1,8 @@
-/* $Id: dispatch.c,v 1.21 2001/03/26 23:36:51 brianp Exp $ */
+/* $Id: dispatch.c,v 1.26 2001/12/15 16:42:59 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
@@ -28,12 +28,7 @@
 /*
  * This file generates all the gl* function entyrpoints.
  * But if we're using X86-optimized dispatch (X86/glapi_x86.S) then
- * each of the entrypoints will be prefixed with _glapi_fallback_*
- * and will be called by the glapi_x86.S code when we're in thread-
- * safe mode.
- *
- * Eventually this file may be replaced by automatically generated
- * code from an API spec file.
+ * we don't use this code.
  *
  * NOTE: This file should _not_ be used when compiling Mesa for a DRI-
  * based device driver.
@@ -41,7 +36,6 @@
  */
 
 
-
 #ifdef PC_HEADER
 #include "all.h"
 #else
@@ -51,64 +45,43 @@
 #include "glthread.h"
 #endif
 
+#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
 
-
+#if defined(WIN32)
+#define KEYWORD1 GLAPI
+#else
 #define KEYWORD1
+#endif
+
 #define KEYWORD2 GLAPIENTRY
-#if defined(USE_X86_ASM) && !defined(__WIN32__) && !defined(XF86DRI)
-#define NAME(func) _glapi_fallback_##func
-#elif defined(USE_MGL_NAMESPACE)
+
+#if defined(USE_MGL_NAMESPACE)
 #define NAME(func)  mgl##func
 #else
 #define NAME(func)  gl##func
 #endif
 
-#ifdef DEBUG
-
-#if 0
-static int
-trace(void)
-{
-   static int trace = -1;
-   if (trace < 0)
-      trace = getenv("MESA_TRACE") ? 1 : 0;
-   return trace > 0;
-}
-#endif
-
-#define F stderr
 
-#define DISPATCH(FUNC, ARGS, MESSAGE)                                  \
-   const struct _glapi_table *dispatch;                                        \
-   dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
-   (dispatch->FUNC) ARGS
+#if 0  /* Use this to log GL calls to stdout */
 
-#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)                           \
-   const struct _glapi_table *dispatch;                                        \
-   dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
-   return (dispatch->FUNC) ARGS
+#define F stdout
+#define DISPATCH(FUNC, ARGS, MESSAGE)          \
+   fprintf MESSAGE;                            \
+   (_glapi_Dispatch->FUNC) ARGS;
 
-#if 0
-   /* From both macros above... */
-   if (trace()) {                                                      \
-      fprintf MESSAGE;                                                 \
-      fprintf(F, "\n");                                                        \
-   }
-#endif
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
+   fprintf MESSAGE;                            \
+   return (_glapi_Dispatch->FUNC) ARGS
 
 #else
 
-#define DISPATCH(FUNC, ARGS, MESSAGE)                                  \
-   const struct _glapi_table *dispatch;                                        \
-   dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
-   (dispatch->FUNC) ARGS
+#define DISPATCH(FUNC, ARGS, MESSAGE)          \
+   (_glapi_Dispatch->FUNC) ARGS;
 
-#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)                           \
-   const struct _glapi_table *dispatch;                                        \
-   dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
-   return (dispatch->FUNC) ARGS
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
+   return (_glapi_Dispatch->FUNC) ARGS
 
-#endif
+#endif /* logging */
 
 
 #ifndef GLAPIENTRY
@@ -116,3 +89,6 @@ trace(void)
 #endif
 
 #include "glapitemp.h"
+
+
+#endif /* USE_X86_ASM */