[Mesa-dev] [PATCH] android: generate matching remap_helper to dispatch table

[Oliver McFadden]

On Thu, Oct 04, 2012 at 02:18:44PM +0300, Tapani Pälli wrote:
> On 10/04/2012 02:11 PM, Negreanu, Adrian M wrote:
> > 
> > 
> > On Thu, Oct 4, 2012 at 1:58 PM, Oliver McFadden
> > <oliver.mcfadden at linux.intel.com
> > <mailto:oliver.mcfadden at linux.intel.com>> wrote:
> > 
> >     On Tue, Oct 02, 2012 at 04:20:51PM +0300, Negreanu, Adrian M wrote:
> >     > On Tue, Oct 2, 2012 at 3:01 PM, Tapani Pälli
> >     <tapani.palli at intel.com <mailto:tapani.palli at intel.com>> wrote:
> >     >
> >     > > commit a010215463c63680c69e90202fe3fcd2e5b25fa6 removed ES2 specific
> >     > > dispatch
> >     > > table and remap_helper, since now we are using dispatch.h which is
> >     > > generated
> >     > > from gl_and_es_API.xml we need to generate a matching
> >     remap_helper using
> >     > > the
> >     > > same xml.
> >     > >
> >     > > Signed-off-by: Tapani Pälli <tapani.palli at intel.com
> >     <mailto:tapani.palli at intel.com>>
> >     > > ---
> >     > >  src/mesa/Android.gen.mk <http://Android.gen.mk> | 2 +-
> >     > >  1 file changed, 1 insertion(+), 1 deletion(-)
> >     > >
> >     > > diff --git a/src/mesa/Android.gen.mk <http://Android.gen.mk>
> >     b/src/mesa/Android.gen.mk <http://Android.gen.mk>
> >     > > index c17df1a..e5ce6ce 100644
> >     > > --- a/src/mesa/Android.gen.mk <http://Android.gen.mk>
> >     > > +++ b/src/mesa/Android.gen.mk <http://Android.gen.mk>
> >     > > @@ -136,7 +136,7 @@ $(intermediates)/main/dispatch.h: $(es_hdr_deps)
> >     > >         $(call es-gen, $* -m remap_table)
> >     > >
> >     > >  $(intermediates)/main/remap_helper.h: PRIVATE_SCRIPT :=
> >     $(MESA_PYTHON2)
> >     > > $(glapi)/remap_helper.py
> >     > > -$(intermediates)/main/remap_helper.h: PRIVATE_XML := -f
> >     > > $(glapi)/gl_API.xml
> >     > > +$(intermediates)/main/remap_helper.h: PRIVATE_XML := -f
> >     > > $(glapi)/gl_and_es_API.xml
> >     > >
> >     > >  $(intermediates)/main/remap_helper.h: $(es_hdr_deps)
> >     > >         $(call es-gen, $*)
> >     > > --
> >     > >
> >     > 1.7.11.7
> >     > >
> >     > > _______________________________________________
> >     > > mesa-dev mailing list
> >     > > mesa-dev at lists.freedesktop.org
> >     <mailto:mesa-dev at lists.freedesktop.org>
> >     > > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >     > >
> >     >
> >     >
> >     > I tested it and it works fine;
> >     > the only thing is if doing an incremental build then remove
> >     > $ANDROID_OUT/libmesa_dricore_intermediates/main/remap_helper.h
> > 
> >     It should not be required to manually remove the remap_helper.h file for
> >     an incremental build.  Breaking incremental builds is enough for me to
> >     NAK this patch.
> > 
> >     If the problem is after editing  gl_and_es_API.xml, remap_helper.h is
> >     not regenerated, then you have a missing dependency and need to fix the
> >     Makefile.
> > 
> > 
> > mm -B did the trick
> 
> IMHO this should be good enough, as I touched only the Makefile I think
> there is no way that make could detect it would need to generate a new
> header file.

Oh, I see.  I misunderstood and thought that you had to manually remove
remap_helper.h after each invocation of `mm', rather than just a one-off
event.  In that case:

Reviewed-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>

> 
> > thanks 
> > 
> > -- 
> > Adrian Marius Negreanu
> > Open Source Technology Center 
> > 
> > 
> 
> 
> -- 
> 
> // Tapani
> 
> 



-- 
Oliver McFadden.