diff options
| author | Chia-I Wu <[email protected]> | 2010-05-05 10:59:44 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-05 11:57:46 +0800 |
| commit | a6ec153830ea25958f8cb5f5b5ae7a3433d61bbc (patch) | |
| tree | d7a97f7581cb6e9c5232c1a17ff1452eb4614dbb /src/mesa/main/es_generator.py | |
| parent | b29b27c118f2f813b07475e0c470b338ed5987aa (diff) | |
mesa: Fix build of ES overlay.
ES overlay is built with FEATURE_ES1 or FEATURE_ES2, and is built
without FEATURE_GL. Fix the build by always building OpenGL ES sources,
but test for FEATURE_ES1 or FEATURE_ES2. Also, define symbols that are
missing because FEATURE_GL is not defined.
Diffstat (limited to 'src/mesa/main/es_generator.py')
| -rw-r--r-- | src/mesa/main/es_generator.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py index 8f08a3a6f92..12f03a5c229 100644 --- a/src/mesa/main/es_generator.py +++ b/src/mesa/main/es_generator.py @@ -190,7 +190,10 @@ print """/* DO NOT EDIT ************************************************* print """ #include "%s" #include "%s" -""" % (versionHeader, versionExtHeader) +#include "main/mfeatures.h" + +#if FEATURE_%s +""" % (versionHeader, versionExtHeader, shortname.upper()) # Everyone needs these types. print """ @@ -211,16 +214,20 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... ); #include "main/api_exec.h" #include "main/remap.h" +/* cannot include main/dispatch.h here */ #ifdef IN_DRI_DRIVER #define _GLAPI_USE_REMAP_TABLE #endif - #include "es/glapi/glapi-%s/glapi/glapitable.h" #include "es/glapi/glapi-%s/glapi/glapioffsets.h" #include "es/glapi/glapi-%s/glapi/glapidispatch.h" #if FEATURE_remap_table +#if !FEATURE_GL +int driDispatchRemapTable[driDispatchRemapTable_size]; +#endif + #define need_MESA_remap_table #include "es/glapi/glapi-%s/main/remap_helper.h" @@ -728,3 +735,6 @@ for func in keys: print "" print " return exec;" print "}" + +print """ +#endif /* FEATURE_%s */""" % (shortname.upper()) |