projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when debug output is enabled and sarea is notset in r200Clear
[mesa.git]
/
src
/
mesa
/
main
/
dispatch.c
diff --git
a/src/mesa/main/dispatch.c
b/src/mesa/main/dispatch.c
index 0ed24afd30a31165f0db8b7894e94b3540eeb1e6..bf1a01378968cf6bc5379fee6923a7b4bdbfb2a0 100644
(file)
--- a/
src/mesa/main/dispatch.c
+++ b/
src/mesa/main/dispatch.c
@@
-1,10
+1,8
@@
-/* $Id: dispatch.c,v 1.26 2001/12/15 16:42:59 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
4.1
+ * Version:
6.3
*
*
- * Copyright (C) 1999-200
1
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
4
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"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-25,32
+23,35
@@
*/
*/
-/*
- * This file generates all the gl* function entyrpoints.
- * 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
-#ifdef PC_HEADER
-#include "all.h"
-#else
-#include "glheader.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
-#endif
+#include "main/glheader.h"
+#include "main/compiler.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
#if defined(WIN32)
#define KEYWORD1 GLAPI
#else
-#define KEYWORD1
+#define KEYWORD1
PUBLIC
#endif
#define KEYWORD2 GLAPIENTRY
#endif
#define KEYWORD2 GLAPIENTRY
@@
-61,25
+62,24
@@
#define NAME(func) gl##func
#endif
#define NAME(func) gl##func
#endif
-
-#if 0 /* Use this to log GL calls to stdout */
+#if 0 /* Use this to log GL calls to stdout (for DEBUG only!) */
#define F stdout
#define DISPATCH(FUNC, ARGS, MESSAGE) \
fprintf MESSAGE; \
#define F stdout
#define DISPATCH(FUNC, ARGS, MESSAGE) \
fprintf MESSAGE; \
-
(_glapi_Dispatch->FUNC) ARGS
;
+
CALL_ ## FUNC(GET_DISPATCH(), ARGS)
;
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
fprintf MESSAGE; \
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
fprintf MESSAGE; \
- return
(_glapi_Dispatch->FUNC) ARGS
+ return
CALL_ ## FUNC(GET_DISPATCH(), ARGS);
#else
#define DISPATCH(FUNC, ARGS, MESSAGE) \
#else
#define DISPATCH(FUNC, ARGS, MESSAGE) \
-
(_glapi_Dispatch->FUNC) ARGS
;
+
CALL_ ## FUNC(GET_DISPATCH(), ARGS)
;
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
- return
(_glapi_Dispatch->FUNC) ARGS
+ return
CALL_ ## FUNC(GET_DISPATCH(), ARGS);
#endif /* logging */
#endif /* logging */
@@
-88,7
+88,9
@@
#define GLAPIENTRY
#endif
#define GLAPIENTRY
#endif
-#include "glapi
temp
.h"
-
+#include "glapi
/dispatch
.h"
+#include "glapi/glapitemp.h"
#endif /* USE_X86_ASM */
#endif /* USE_X86_ASM */
+
+#endif /* !GLX_USE_APPLEGL */