On 1 November 2012 01:08, Tapani Pälli <tapani.pa...@intel.com> wrote:
> On 11/01/2012 07:28 AM, Tapani Pälli wrote: > > On 11/01/2012 12:42 AM, Paul Berry wrote: > >> On 31 October 2012 15:21, Chad Versace <chad.vers...@linux.intel.com > >> <mailto:chad.vers...@linux.intel.com>> wrote: > >> > >> Tapani, see the bottom of the message. > >> > >> On 10/30/2012 10:42 AM, Paul Berry wrote: > >> > Previously dispatch table-related code was generated from > gl_API.xml, > >> > so it did not include slots for GLES1-only functions (such as > those > >> > taking fixed-point arguments). > >> > > >> > This patch generates dispatch table-related code from > >> > gl_and_es_API.xml, so that GLES1-only functions are included. > This > >> > paves the way for future patches that will unify the GLES1 > dispatch > >> > table with the dispatch tables for the other APIs. > >> > > >> > The following generated files are affected: > >> > - glapi_x86.S > >> > - glapi_x86-64.S > >> > - glapi_sparc.S > >> > - glprocs.h > >> > - glapitemp.h > >> > - glapitable.h > >> > - glapi_gentable.c > >> > - dispatch.h > >> > - remap_helper.h > >> > > >> > Since this change affects makefiles, a full rebuild is required. > >> > --- > >> > src/mapi/glapi/SConscript | 6 +++--- > >> > src/mapi/glapi/gen/Makefile.am | 18 +++++++++--------- > >> > src/mapi/glapi/gen/SConscript | 10 +++++----- > >> > 3 files changed, 17 insertions(+), 17 deletions(-) > >> > > >> > >> > diff --git a/src/mapi/glapi/gen/Makefile.am > >> b/src/mapi/glapi/gen/Makefile.am > >> > index 40aaf51..24bdbaf 100644 > >> > --- a/src/mapi/glapi/gen/Makefile.am > >> > +++ b/src/mapi/glapi/gen/Makefile.am > >> > @@ -187,27 +187,27 @@ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: > >> $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON_ES) > >> > --printer glapi --mode lib > >> $(srcdir)/gl_and_es_API.xml > $@ > >> > > >> > >> I see a dependency bug. The rules below depend on list COMMON, which > >> does not > >> contain gl_and_es_API.xml. I think the best way to fix this is to > >> remove the > >> list COMMON_ES and fold its contents into COMMON. > >> > >> > >> Oops, good catch. I'll make that fix and send out a v2 of this patch. > >> > >> > >> > >> > $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) > >> > - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ > >> > + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ > >> > > >> > $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON) > >> > - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ > >> > + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ > >> > > >> > $(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON) > >> > - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ > >> > + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ > >> > > >> > $(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON) > >> > - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ > >> > + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ > >> > > >> > >> > >> This patch doesn't touch the Android makefiles, and I think that's > >> ok. Still, > >> I want to verify with Tapani that this won't break the Android build > >> before > >> comitting. > >> > >> > >> Yeah, I don't really understand how the Android build process handles > >> these generated files--they don't seem to appear in any of the > >> Android.mk files. Tapani, I'm hoping I can commit these patches > >> tomorrow morning (pacific time) so I can send out another patch series > >> that depends on them. Do you think you will have time to try the series > >> out before then? > > > > > > Yes, I'll test this series today. > > > > ... and I'm happy to report that GLES1.1 on Android works just fine with > this patch set. These files were coming to Android make from sources.mak > in MESA_FILES variable. > Thanks, Tapani. Pushed.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
