Mesa (master): glapi: Move glapidispatch.h to core mesa.
Chia-I Wu
olv at kemper.freedesktop.org
Fri Oct 29 05:02:33 UTC 2010
Module: Mesa
Branch: master
Commit: e213968f2b99b07e20b69e4dd6f94bea35f54161
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e213968f2b99b07e20b69e4dd6f94bea35f54161
Author: Chia-I Wu <olv at lunarg.com>
Date: Tue Oct 26 03:42:09 2010 +0800
glapi: Move glapidispatch.h to core mesa.
It is a core mesa header, not a glapi header.
---
src/mapi/glapi/gen-es/Makefile | 2 +-
src/mapi/glapi/gen/Makefile | 10 +++++-----
src/mesa/main/dispatch.h | 2 +-
src/mesa/main/es_generator.py | 2 +-
src/{mapi/glapi => mesa/main}/glapidispatch.h | 0
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mapi/glapi/gen-es/Makefile b/src/mapi/glapi/gen-es/Makefile
index bda8e9e..709cfa8 100644
--- a/src/mapi/glapi/gen-es/Makefile
+++ b/src/mapi/glapi/gen-es/Makefile
@@ -3,7 +3,6 @@ GLAPI = ../gen
include $(TOP)/configs/current
OUTPUTS := \
- glapi/glapidispatch.h \
glapi/glapioffsets.h \
glapi/glapitable.h \
glapi/glapitemp.h \
@@ -11,6 +10,7 @@ OUTPUTS := \
glapi/glapi_sparc.S \
glapi/glapi_x86-64.S \
glapi/glapi_x86.S \
+ main/glapidispatch.h \
main/remap_helper.h
COMMON = gl_XML.py glX_XML.py license.py typeexpr.py
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 7ecd00d..e8da34d 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -15,8 +15,7 @@ MESA_GLAPI_OUTPUTS = \
$(MESA_GLAPI_DIR)/glprocs.h \
$(MESA_GLAPI_DIR)/glapitemp.h \
$(MESA_GLAPI_DIR)/glapioffsets.h \
- $(MESA_GLAPI_DIR)/glapitable.h \
- $(MESA_GLAPI_DIR)/glapidispatch.h
+ $(MESA_GLAPI_DIR)/glapitable.h
MESA_GLAPI_ASM_OUTPUTS = \
$(MESA_GLAPI_DIR)/glapi_x86.S \
@@ -27,6 +26,7 @@ MESA_OUTPUTS = \
$(MESA_GLAPI_OUTPUTS) \
$(MESA_GLAPI_ASM_OUTPUTS) \
$(MESA_DIR)/main/enums.c \
+ $(MESA_DIR)/main/glapidispatch.h \
$(MESA_DIR)/main/remap_helper.h \
$(MESA_GLX_DIR)/indirect.c \
$(MESA_GLX_DIR)/indirect.h \
@@ -138,9 +138,6 @@ $(MESA_GLAPI_DIR)/glapioffsets.h: gl_offsets.py $(COMMON)
$(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< > $@
-$(MESA_GLAPI_DIR)/glapidispatch.h: gl_table.py $(COMMON)
- $(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
-
######################################################################
$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
@@ -159,6 +156,9 @@ $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(ES_API)
-f $(MESA_GLAPI_DIR)/gen-es/es1_API.xml \
-f $(MESA_GLAPI_DIR)/gen-es/es2_API.xml > $@
+$(MESA_DIR)/main/glapidispatch.h: gl_table.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
+
$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< > $@
diff --git a/src/mesa/main/dispatch.h b/src/mesa/main/dispatch.h
index 27f80a5..e39d3e2 100644
--- a/src/mesa/main/dispatch.h
+++ b/src/mesa/main/dispatch.h
@@ -32,6 +32,6 @@
#include "glapi/glapitable.h"
#include "glapi/glapioffsets.h"
-#include "glapi/glapidispatch.h"
+#include "main/glapidispatch.h"
#endif /* _DISPATCH_H */
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index ecb34bb..b787f1b 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -221,7 +221,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
#endif
#include "%sapi/glapi/glapitable.h"
#include "%sapi/glapi/glapioffsets.h"
-#include "%sapi/glapi/glapidispatch.h"
+#include "%sapi/main/glapidispatch.h"
#if FEATURE_remap_table
diff --git a/src/mapi/glapi/glapidispatch.h b/src/mesa/main/glapidispatch.h
similarity index 100%
rename from src/mapi/glapi/glapidispatch.h
rename to src/mesa/main/glapidispatch.h
More information about the mesa-commit
mailing list