More GL_EXT_framebuffer_object: rename some things, added device driver hooks.

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

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index cc14c4b498d2ed31226d7b2c98f166d358f81cf9..946f39d1f983c26a826d5aa350be03489adac30c 100644 (file)
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -1,10 +1,8 @@
-/* $Id: dispatch.c,v 1.22 2001/03/28 17:20:20 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.3
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,12 +24,9 @@
 
 
 /*
- * This file generates all the gl* function entyrpoints.
+ * This file generates all the gl* function entrypoints.
  * But if we're using X86-optimized dispatch (X86/glapi_x86.S) then
- * we don't use this file's code.
- *
- * 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.
@@ -39,30 +34,48 @@
  */
 
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
 #include "glheader.h"
 #include "glapi.h"
 #include "glapitable.h"
 #include "glthread.h"
-#endif
 
-#if !defined(USE_X86_ASM)
 
-#define KEYWORD1
+#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
+
+#if defined(WIN32)
+#define KEYWORD1 GLAPI
+#else
+#define KEYWORD1 PUBLIC
+#endif
+
 #define KEYWORD2 GLAPIENTRY
+
 #if defined(USE_MGL_NAMESPACE)
 #define NAME(func)  mgl##func
 #else
 #define NAME(func)  gl##func
 #endif
 
+#if 0  /* Use this to log GL calls to stdout (for DEBUG only!) */
+
+#define F stdout
+#define DISPATCH(FUNC, ARGS, MESSAGE)          \
+   fprintf MESSAGE;                            \
+   GL_CALL(FUNC) ARGS;
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
+   fprintf MESSAGE;                            \
+   return GL_CALL(FUNC) ARGS;
+
+#else
+
 #define DISPATCH(FUNC, ARGS, MESSAGE)          \
-   (_glapi_Dispatch->FUNC) ARGS
+   GL_CALL(FUNC) ARGS;
 
 #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
-   return (_glapi_Dispatch->FUNC) ARGS
+   return GL_CALL(FUNC) ARGS;
+
+#endif /* logging */
 
 
 #ifndef GLAPIENTRY