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/mapi/glapi/gen-es/Makefile | |
| 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/mapi/glapi/gen-es/Makefile')
| -rw-r--r-- | src/mapi/glapi/gen-es/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mapi/glapi/gen-es/Makefile b/src/mapi/glapi/gen-es/Makefile index bf66ec037cf..3fd539d26d5 100644 --- a/src/mapi/glapi/gen-es/Makefile +++ b/src/mapi/glapi/gen-es/Makefile @@ -11,8 +11,8 @@ OUTPUTS := \ COMMON = gl_and_es_API.xml gl_XML.py glX_XML.py license.py typeexpr.py COMMON := $(addprefix $(GLAPI)/, $(COMMON)) -ES1_APIXML := es1_API.xml -ES2_APIXML := es2_API.xml +ES1_APIXML := $(GLAPI)/gl_and_es_API.xml +ES2_APIXML := $(GLAPI)/gl_and_es_API.xml ES1_OUTPUT_DIR := $(TOP)/src/mapi/es1api ES2_OUTPUT_DIR := $(TOP)/src/mapi/es2api @@ -37,10 +37,12 @@ shared-glapi: $(SHARED_GLAPI_OUTPUTS) $(ES1_OUTPUTS): APIXML := $(ES1_APIXML) $(ES1_OUTPUTS): PRINTER := es1api +$(ES1_OUTPUTS): GLES_VER := es1 $(ES1_OUTPUTS): $(ES1_DEPS) $(ES2_OUTPUTS): APIXML := $(ES2_APIXML) $(ES2_OUTPUTS): PRINTER := es2api +$(ES2_OUTPUTS): GLES_VER := es2 $(ES2_OUTPUTS): $(ES2_DEPS) $(SHARED_GLAPI_OUTPUTS): APIXML := $(SHARED_GLAPI_APIXML) @@ -49,7 +51,7 @@ $(SHARED_GLAPI_OUTPUTS): $(SHARED_GLAPI_DEPS) define gen-glapi @mkdir -p $(dir $@) - $(PYTHON2) $(PYTHON_FLAGS) $< -f $(APIXML) $(1) > $@ + $(PYTHON2) $(PYTHON_FLAGS) $< -f $(APIXML) -c $(GLES_VER) $(1) > $@ endef %/glapi_mapi_tmp.h: $(MAPI)/mapi_abi.py $(COMMON) @@ -58,7 +60,7 @@ endef --printer $(PRINTER) --mode lib $(GLAPI)/gl_and_es_API.xml > $@ %/main/dispatch.h: $(GLAPI)/gl_table.py $(COMMON) - $(call gen-glapi,-c -m remap_table) + $(call gen-glapi,-m remap_table) %/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON) $(call gen-glapi) |