summaryrefslogtreecommitdiff
path: root/src/mesa
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
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')
-rw-r--r--src/mesa/glapi/dispatch.h3
-rw-r--r--src/mesa/glapi/gl_table.py1
-rw-r--r--src/mesa/glapi/glapi.h5
-rw-r--r--src/mesa/glapi/glapitable.h1
-rw-r--r--src/mesa/main/blend.c1
-rw-r--r--src/mesa/main/context.c2
-rw-r--r--src/mesa/main/mtypes.h3
7 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 7123156085..98f654f402 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -28,6 +28,9 @@
#if !defined( _DISPATCH_H_ )
# define _DISPATCH_H_
+#include "glapitable.h"
+
+
/**
* \file dispatch.h
* Macros for handling GL dispatch tables.
diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 69f7bd7c7b..7023a4b71a 100644
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -56,7 +56,6 @@ class PrintGlTable(gl_XML.gl_print_base):
print '# define GLAPIENTRYP GLAPIENTRY *'
print '#endif'
print ''
- print 'typedef void (*_glapi_proc)(void); /* generic function pointer */'
print ''
print 'struct _glapi_table'
print '{'
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index ddfb1cffb9..20d35769cf 100644
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -46,10 +46,13 @@
#include "GL/gl.h"
-#include "glapitable.h"
#include "glthread.h"
+struct _glapi_table;
+
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 48941f5590..5d9d40a8a2 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -37,7 +37,6 @@
# define GLAPIENTRYP GLAPIENTRY *
#endif
-typedef void (*_glapi_proc)(void); /* generic function pointer */
struct _glapi_table
{
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"