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 712315608529e660587d66235e71df214779db37..98f654f4022d69b840724a8c20052d0b0ddafb83 100644 (file)
--- 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 69f7bd7c7b5c3a7b7ebfd3436d0747cd81a302e0..7023a4b71a329fd749c67f98e22bcd8db2de69ec 100644 (file)
--- 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 ddfb1cffb915b7493076eb86575a80cbd37947c6..20d35769cf8d94573570eafcc96da2dbf094a24d 100644 (file)
--- 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 48941f5590ed4029194914859a7d819fbb11d57d..5d9d40a8a254bfd21de51e61356a2bb5e0ac0ce8 100644 (file)
--- 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 81bd4c2f32038a0eb0d30bb24618d5aa9c25d8b2..742247f8e2115270f748c39e7932b717fe9c65d1 100644 (file)
--- 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 96afbe8b7da05e9b63ae3bd0962bcd90811beaef..74f0add6f4491ce160dad32d4aa192c5e12b796a 100644 (file)
--- 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 0a7a93063855bb14a7e22a376958d9b8ff0c4ca1..867072165a8adf68b39245edc0cf4fe94d15220d 100644 (file)
--- 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"