diff options
| author | Chia-I Wu <[email protected]> | 2011-08-08 10:14:44 +0900 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-08-13 13:54:57 +0800 |
| commit | 5076561b35b9c2c78f277ab03bf1e642094ee20e (patch) | |
| tree | 3f38f5a30dd0fa18023e3b16728103a8171dd994 /src/mesa/SConscript | |
| parent | b8202b3d44b18a3db281c64d1ca01e851ae6deb1 (diff) | |
glapi: use gl_and_es_API.xml to generate GLES headers
glapi/gen-es/ defines two sets of GLAPI XMLs for OpenGL ES 1.1
(es1_API.xml) and 2.0 (es2_API.xml) respectively. They are used to
generate dispatch.h and remap_helper.h for GLES. Together with
gl_and_es_API.xml, we have to maintain three sets of GLAPI XMLs.
This commit makes dispatch.h and remap_helper.h for GLES be generated
from gl_and_es_API.xml.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index cbd16625186..ac85a3eeb05 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -349,26 +349,26 @@ if env['gles']: gles_headers += env.CodeGenerate( target = 'es1api/main/dispatch.h', script = GLAPI + 'gen/gl_table.py', - source = GLAPI + 'gen-es/es1_API.xml', - command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -c es1 -m remap_table -f $SOURCE > $TARGET', ) gles_headers += env.CodeGenerate( target = 'es1api/main/remap_helper.h', script = GLAPI + 'gen/remap_helper.py', - source = GLAPI + 'gen-es/es1_API.xml', - command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -c es1 -f $SOURCE > $TARGET', ) gles_headers += env.CodeGenerate( target = 'es2api/main/dispatch.h', script = GLAPI + 'gen/gl_table.py', - source = GLAPI + 'gen-es/es2_API.xml', - command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -c es2 -m remap_table -f $SOURCE > $TARGET', ) gles_headers += env.CodeGenerate( target = 'es2api/main/remap_helper.h', script = GLAPI + 'gen/remap_helper.py', - source = GLAPI + 'gen-es/es2_API.xml', - command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -c es2 -f $SOURCE > $TARGET', ) env.Depends(gles_sources, gles_headers) |