summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-13 16:45:15 -0600
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-21 22:13:55 -0700
commit2dbc515a669be123a019aeb4aa5aae6b1679f6a9 (patch)
treef5fc2e1a77c9ef3fd4d787b42677d6c2806d5695 /src/mesa/main
parentd22ef6bcbaf083b601fe6b37ef2e65e81116082b (diff)
mesa: move some glapi bits around
Move _glapi_proc typedef from glapitable.h to glapi.h Also, don't include glapitable.h from glapi.h Before we were including the huge glapitable.h file in every .c file.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/blend.c1
-rw-r--r--src/mesa/main/context.c2
-rw-r--r--src/mesa/main/mtypes.h3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 81bd4c2f32..742247f8e2 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -36,6 +36,7 @@
#include "enums.h"
#include "macros.h"
#include "mtypes.h"
+#include "glapi/glapitable.h"
/**
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 96afbe8b7d..74f0add6f4 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -145,6 +145,8 @@
#include "version.h"
#include "vtxfmt.h"
#include "glapi/glthread.h"
+#include "glapi/glapioffsets.h"
+#include "glapi/glapitable.h"
#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
#include "shader/program.h"
#endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0a7a930638..867072165a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -38,8 +38,7 @@
#include "glheader.h"
#include <GL/internal/glcore.h> /* __GLcontextModes (GLvisual) */
#include "config.h" /* Hardwired parameters */
-#include "glapi/glapitable.h"
-#include "glapi/glthread.h"
+#include "glapi/glapi.h"
#include "math/m_matrix.h" /* GLmatrix */
#include "bitset.h"