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/mesa/main/es_generator.py | |
| 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/mesa/main/es_generator.py')
| -rw-r--r-- | src/mesa/main/es_generator.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py index 5b49416782d..c0b0a445806 100644 --- a/src/mesa/main/es_generator.py +++ b/src/mesa/main/es_generator.py @@ -681,9 +681,7 @@ print """ #if FEATURE_remap_table /* define esLocalRemapTable */ -/* cannot include main/dispatch.h here */ -#define _GLAPI_USE_REMAP_TABLE -#include "%sapi/main/glapidispatch.h" +#include "%sapi/main/dispatch.h" #define need_MESA_remap_table #include "%sapi/main/remap_helper.h" @@ -719,8 +717,7 @@ init_remap_table(void) #else /* FEATURE_remap_table */ -/* cannot include main/dispatch.h here */ -#include "%sapi/main/glapidispatch.h" +#include "%sapi/main/dispatch.h" static INLINE void init_remap_table(void) |