diff options
| author | Chia-I Wu <[email protected]> | 2011-06-08 22:24:32 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-06-08 23:19:01 +0800 |
| commit | 4bb748b609288205ddea750550185d7642025bff (patch) | |
| tree | 30b031eaaccb8ee29b25ffad9916422706377f9b /src/mapi/glapi/gen | |
| parent | 0dc45374f2c62e33680f3a5729a18ba9ee40cd4d (diff) | |
mesa: merge glapidispatch.h into dispatch.h
glapidispatch.h was located in glapi and shared with mesa core. Because
the way it was shared, mesa core must include it indirectly via
main/dispatch.h.
Now that it is no longer needed by glapi and is located in core mesa,
merging it with main/dispatch.h to avoid wrong uses.
Diffstat (limited to 'src/mapi/glapi/gen')
| -rw-r--r-- | src/mapi/glapi/gen/Makefile | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_table.py | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile index c3829dc005e..7415bdc5267 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile @@ -27,7 +27,7 @@ MESA_OUTPUTS = \ $(MESA_GLAPI_OUTPUTS) \ $(MESA_GLAPI_ASM_OUTPUTS) \ $(MESA_DIR)/main/enums.c \ - $(MESA_DIR)/main/glapidispatch.h \ + $(MESA_DIR)/main/dispatch.h \ $(MESA_DIR)/main/remap_helper.h \ $(MESA_GLX_DIR)/indirect.c \ $(MESA_GLX_DIR)/indirect.h \ @@ -180,7 +180,7 @@ $(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) +$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) $(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@ $(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON) diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py index bd3f3eb71c7..05979e3813f 100644 --- a/src/mapi/glapi/gen/gl_table.py +++ b/src/mapi/glapi/gen/gl_table.py @@ -73,7 +73,7 @@ class PrintRemapTable(gl_XML.gl_print_base): gl_XML.gl_print_base.__init__(self) self.es = es - self.header_tag = '_GLAPI_DISPATCH_H_' + self.header_tag = '_DISPATCH_H_' self.name = "gl_table.py (from Mesa)" self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") return @@ -81,10 +81,8 @@ class PrintRemapTable(gl_XML.gl_print_base): def printRealHeader(self): print """ -/* this file should not be included directly in mesa */ - /** - * \\file glapidispatch.h + * \\file main/dispatch.h * Macros for handling GL dispatch tables. * * For each known GL function, there are 3 macros in this file. The first @@ -93,8 +91,9 @@ class PrintRemapTable(gl_XML.gl_print_base): * can SET_FuncName, are used to get and set the dispatch pointer for the * named function in the specified dispatch table. */ + +#include "main/mfeatures.h" """ - return def printBody(self, api): @@ -139,14 +138,14 @@ class PrintRemapTable(gl_XML.gl_print_base): print '#define _gloffset_%s %d' % (f.name, f.offset) print '' - print '#if !defined(_GLAPI_USE_REMAP_TABLE)' + print '#if !FEATURE_remap_table' print '' for f, index in functions: print '#define _gloffset_%s %d' % (f.name, f.offset) print '' - print '#else /* !_GLAPI_USE_REMAP_TABLE */' + print '#else /* !FEATURE_remap_table */' print '' if self.es: @@ -171,7 +170,7 @@ class PrintRemapTable(gl_XML.gl_print_base): print '#define _gloffset_%s %s[%s_remap_index]' % (f.name, remap_table, f.name) print '' - print '#endif /* _GLAPI_USE_REMAP_TABLE */' + print '#endif /* !FEATURE_remap_table */' print '' for f, index in abi_functions + functions: @@ -200,12 +199,12 @@ class PrintRemapTable(gl_XML.gl_print_base): print '#define SET_%s(disp, fn) SET_%s(disp, fn)' % (name, f.name) print '' - print '#if defined(_GLAPI_USE_REMAP_TABLE)' + print '#if FEATURE_remap_table' for f in alias_functions: for name in f.entry_points: if name != f.name: print '#define %s_remap_index %s_remap_index' % (name, f.name) - print '#endif /* defined(_GLAPI_USE_REMAP_TABLE) */' + print '#endif /* FEATURE_remap_table */' print '' return |