X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdispatch.c;h=34127cb248ad07a84d21491ccf7c7585e8be73fa;hb=08d90fe8a5e12d92994c05b2ec9f68ab7232275c;hp=44586502e4cb8b1996fa2399ef2f23696a4a32a5;hpb=1136412013d76a5cc197a10fcab99da03c642378;p=mesa.git

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 44586502e4c..34127cb248a 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -23,29 +23,34 @@
  */
 
 
-/*
- * 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 code.
+/**
+ * \file dispatch.c
+ *
+ * This file generates all the gl* function entrypoints.  This code is not
+ * used if optimized assembly stubs are available (e.g., using x86/glapi_x86.S
+ * on IA32 or sparc/glapi_sparc.S on SPARC).
  *
- * NOTE: This file should _not_ be used when compiling Mesa for a DRI-
- * based device driver.
+ * \note
+ * This file is also used to build the client-side libGL that loads DRI-based
+ * device drivers.  At build-time it is symlinked to src/glx/x11.
  *
+ * \author Brian Paul <brian@precisioninsight.com>
  */
 
+#ifndef GLX_USE_APPLEGL
 
-#include "glheader.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
+#include "main/glheader.h"
+#include "glapi/glapi.h"
+#include "glapi/glapitable.h"
+#include "glapi/glthread.h"
 
 
-#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
+#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
 
 #if defined(WIN32)
 #define KEYWORD1 GLAPI
 #else
-#define KEYWORD1
+#define KEYWORD1 PUBLIC
 #endif
 
 #define KEYWORD2 GLAPIENTRY
@@ -61,19 +66,19 @@
 #define F stdout
 #define DISPATCH(FUNC, ARGS, MESSAGE)		\
    fprintf MESSAGE;				\
-   GL_CALL(FUNC) ARGS;
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
    fprintf MESSAGE;				\
-   return GL_CALL(FUNC) ARGS;
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #else
 
 #define DISPATCH(FUNC, ARGS, MESSAGE)		\
-   GL_CALL(FUNC) ARGS;
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
-   return GL_CALL(FUNC) ARGS;
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #endif /* logging */
 
@@ -82,7 +87,9 @@
 #define GLAPIENTRY
 #endif
 
-#include "glapitemp.h"
-
+#include "glapi/dispatch.h"
+#include "glapi/glapitemp.h"
 
 #endif /* USE_X86_ASM */
+
+#endif /* !GLX_USE_APPLEGL */