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.
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 7123156..98f654f 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 69f7bd7..7023a4b 100644
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -56,7 +56,6 @@
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 ddfb1cf..20d3576 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 48941f5..5d9d40a 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 81bd4c2..742247f 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 086272c..dcc518e 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -146,6 +146,7 @@
#include "vtxfmt.h"
#include "glapi/glthread.h"
#include "glapi/glapioffsets.h"
+#include "glapi/glapitable.h"
#include "shader/program.h"
#include "shader/shader_api.h"
#include "shader/atifragshader.h"
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 463142f..8a6c843 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"