From cecffa08d191615b59751dc84fe33d051e4a4b67 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 1 Apr 2014 13:04:17 -0700 Subject: [PATCH] glapi: Enable ES compatibility mode Ages ago Chia-I added an ES compatibility flag to several of the various generator scripts. The intention was to bridge differences between ES and desktop in Mesa builds without ES. It doesn't appear that it has ever been used. Recent changes to static_dispatch status of several ES1 functions caused problems in desktop-only, non-shared-glapi builds. Enabling the ES compatibility mode appears to fix these build problems. This is kind of a duct tape solution to this problem. As I mentioned in the cover letter for the series that triggered the build problem, I would like to make some major changes to the generator architecture and the XML. The whole point of the proposed architecture changes is to better handle the differences between desktop GL and ES. I think duct tape is okay for now. Signed-off-by: Ian Romanick Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76869 Tested-by: Brian Paul Tested-by: Lu Hua Cc: Vinson Lee Cc: Chia-I Wu --- src/mapi/glapi/gen/Makefile.am | 2 +- src/mapi/glapi/gen/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 7b3c118..e3ac348 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -208,7 +208,7 @@ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON) --printer glapi --mode lib $(srcdir)/gl_and_es_API.xml > $@ $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) - $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ + $(PYTHON_GEN) $< -c -f $(srcdir)/gl_and_es_API.xml > $@ $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript index e4abe90..4d827b0 100644 --- a/src/mapi/glapi/gen/SConscript +++ b/src/mapi/glapi/gen/SConscript @@ -38,7 +38,7 @@ env.CodeGenerate( target = '../../../mapi/glapi/glprocs.h', script = 'gl_procs.py', source = sources, - command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' + command = python_cmd + ' -c $SCRIPT -f $SOURCE > $TARGET' ) env.CodeGenerate( -- 2.7.4