Mesa (master): mesa: Move src/mesa/glapi/dispatch.h to mesa.
Chia-I Wu
olv at kemper.freedesktop.org
Thu Feb 25 13:48:26 UTC 2010
Module: Mesa
Branch: master
Commit: 2cf44390d1e819f23e1d7ceb3199276c9148c647
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2cf44390d1e819f23e1d7ceb3199276c9148c647
Author: Chia-I Wu <olv at lunarg.com>
Date: Wed Feb 24 12:01:14 2010 +0800
mesa: Move src/mesa/glapi/dispatch.h to mesa.
glapi/dispatch.h is a core Mesa header file. Move the header file to
main/ to make this clear. It also becomes clear after this change that
IN_DRI_DRIVER is only used in core Mesa to enable the remap table.
---
src/mesa/es/main/drawtex.c | 2 +-
src/mesa/es/main/es_generator.py | 2 +-
src/mesa/glapi/gen/extension_helper.py | 2 +-
src/mesa/glapi/gen/remap_helper.py | 2 +-
src/mesa/main/accum.c | 2 +-
src/mesa/main/api_arrayelt.c | 2 +-
src/mesa/main/api_exec.c | 2 +-
src/mesa/main/api_loopback.c | 2 +-
src/mesa/main/api_noop.c | 2 +-
src/mesa/main/arrayobj.c | 2 +-
src/mesa/main/attrib.c | 2 +-
src/mesa/main/colortab.c | 2 +-
src/mesa/main/convolve.c | 2 +-
src/mesa/{glapi => main}/dispatch.h | 0
src/mesa/main/dlist.c | 2 +-
src/mesa/main/drawpix.c | 2 +-
src/mesa/main/eval.c | 2 +-
src/mesa/main/feedback.c | 2 +-
src/mesa/main/histogram.c | 2 +-
src/mesa/main/pixel.c | 2 +-
src/mesa/main/queryobj.c | 2 +-
src/mesa/main/rastpos.c | 2 +-
src/mesa/main/remap.c | 4 ++--
src/mesa/main/remap_helper.h | 2 +-
src/mesa/main/texgen.c | 2 +-
src/mesa/main/varray.c | 2 +-
src/mesa/main/vtxfmt_tmp.h | 2 +-
src/mesa/shader/shader_api.c | 2 +-
src/mesa/vbo/vbo_exec_api.c | 2 +-
src/mesa/vbo/vbo_exec_eval.c | 2 +-
src/mesa/vbo/vbo_save_api.c | 2 +-
src/mesa/vbo/vbo_save_loopback.c | 2 +-
32 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/mesa/es/main/drawtex.c b/src/mesa/es/main/drawtex.c
index cbd41ca..42f4409 100644
--- a/src/mesa/es/main/drawtex.c
+++ b/src/mesa/es/main/drawtex.c
@@ -25,7 +25,7 @@
#include "main/state.h"
#include "main/imports.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_OES_draw_texture
diff --git a/src/mesa/es/main/es_generator.py b/src/mesa/es/main/es_generator.py
index 590f594..f736792 100644
--- a/src/mesa/es/main/es_generator.py
+++ b/src/mesa/es/main/es_generator.py
@@ -207,7 +207,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
#include "main/compiler.h"
#include "main/api_exec.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
typedef void (*_glapi_proc)(void); /* generic function pointer */
"""
diff --git a/src/mesa/glapi/gen/extension_helper.py b/src/mesa/glapi/gen/extension_helper.py
index 83471d8..2c83b4e 100644
--- a/src/mesa/glapi/gen/extension_helper.py
+++ b/src/mesa/glapi/gen/extension_helper.py
@@ -151,7 +151,7 @@ class PrintGlExtensionGlue(gl_XML.gl_print_base):
def printRealHeader(self):
print '#include "utils.h"'
- print '#include "glapi/dispatch.h"'
+ print '#include "main/dispatch.h"'
print ''
return
diff --git a/src/mesa/glapi/gen/remap_helper.py b/src/mesa/glapi/gen/remap_helper.py
index d93c7a4..8b50526 100644
--- a/src/mesa/glapi/gen/remap_helper.py
+++ b/src/mesa/glapi/gen/remap_helper.py
@@ -64,7 +64,7 @@ class PrintGlRemap(gl_XML.gl_print_base):
def printRealHeader(self):
- print '#include "glapi/dispatch.h"'
+ print '#include "main/dispatch.h"'
print ''
return
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 032e13b..2012d00 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -29,7 +29,7 @@
#include "macros.h"
#include "state.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_accum
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 469b452..ffcd194 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -32,7 +32,7 @@
#include "context.h"
#include "imports.h"
#include "macros.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
typedef void (GLAPIENTRY *array_func)( const void * );
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e62c7aa..f8e004a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -104,7 +104,7 @@
#if FEATURE_ARB_sync
#include "syncobj.h"
#endif
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 3d466ac..aedc509 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -36,7 +36,7 @@
#include "glapi/glapi.h"
#include "glapi/glapitable.h"
#include "glapi/glthread.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
* calls to a smaller set of driver-provided formats. Currently just
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index f72f957..9a36394 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -32,7 +32,7 @@
#include "macros.h"
#include "dlist.h"
#include "eval.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/**
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 7feaee3..0069cd3 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -48,7 +48,7 @@
#endif
#include "arrayobj.h"
#include "macros.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/**
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 9a32bc3..92fb8d2 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -56,7 +56,7 @@
#include "varray.h"
#include "viewport.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/**
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 7858131..52d5bad 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -32,7 +32,7 @@
#include "state.h"
#include "teximage.h"
#include "texstate.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_colortable
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 5ed93e0..15e8dff 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -39,7 +39,7 @@
#include "image.h"
#include "mtypes.h"
#include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_convolve
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/main/dispatch.h
similarity index 100%
rename from src/mesa/glapi/dispatch.h
rename to src/mesa/main/dispatch.h
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9ef7fca..673db30 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -66,7 +66,7 @@
#include "math/m_matrix.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 0afd47b..84cb786 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -32,7 +32,7 @@
#include "framebuffer.h"
#include "readpix.h"
#include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_drawpix
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 58eb59b..bd2e117 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -44,7 +44,7 @@
#include "eval.h"
#include "macros.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_evaluators
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index fcdbb75..e20456f 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -36,7 +36,7 @@
#include "feedback.h"
#include "macros.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_feedback
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index c7304e8..3a65bb1 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -29,7 +29,7 @@
#include "context.h"
#include "image.h"
#include "histogram.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_histogram
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index e2e3854..675e933 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -35,7 +35,7 @@
#include "macros.h"
#include "pixel.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_pixel_transfer
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 471352f..e14511a 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -29,7 +29,7 @@
#include "imports.h"
#include "queryobj.h"
#include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_queryobj
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index be61dc2..d72b846 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -34,7 +34,7 @@
#include "macros.h"
#include "rastpos.h"
#include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_rastpos
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index 5f32a48..8d9df6b 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -38,7 +38,7 @@
#include "remap.h"
#include "imports.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_remap_table
@@ -183,7 +183,7 @@ _mesa_map_static_functions(void)
/**
* Initialize the remap table. This is called in one_time_init().
* The remap table needs to be initialized before calling the
- * CALL/GET/SET macros defined in glapi/dispatch.h.
+ * CALL/GET/SET macros defined in main/dispatch.h.
*/
void
_mesa_init_remap_table(void)
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 2c8f0de..0a5b629 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -25,7 +25,7 @@
* SOFTWARE.
*/
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
struct gl_function_remap {
GLint func_index;
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index 2ae839b..e70ea30 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -37,7 +37,7 @@
#include "main/texgen.h"
#include "main/texstate.h"
#include "math/m_matrix.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#if FEATURE_texgen
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 86878d6..b4128f8 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -34,7 +34,7 @@
#include "mtypes.h"
#include "varray.h"
#include "arrayobj.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/**
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index ae636fb..037c4b1 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -29,7 +29,7 @@
#define PRE_LOOPBACK( FUNC )
#endif
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
static void GLAPIENTRY TAG(ArrayElement)( GLint i )
{
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 129a973..d0d0575 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -46,7 +46,7 @@
#include "shader/shader_api.h"
#include "shader/slang/slang_compile.h"
#include "shader/slang/slang_link.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
/**
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 3dde982..e40f5f9 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -41,7 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/light.h"
#include "main/api_arrayelt.h"
#include "main/api_noop.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#include "vbo_context.h"
diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c
index a784621..23ad126 100644
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -29,7 +29,7 @@
#include "main/context.h"
#include "main/macros.h"
#include "math/m_eval.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#include "vbo_exec.h"
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 3a64c0c..a5d0279 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -78,7 +78,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/api_validate.h"
#include "main/api_arrayelt.h"
#include "main/vtxfmt.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#include "vbo_context.h"
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index 8d9ae30..f253c85 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -30,7 +30,7 @@
#include "main/enums.h"
#include "main/imports.h"
#include "main/mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
#include "glapi/glapi.h"
#include "vbo_context.h"
More information about the mesa-commit
mailing list