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

[Tapani Pälli]

On 10/02/2012 04:20 PM, 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
> 

For incremental builds you need to run 'mm -B' in the mesa directory
(make clean for a specific project), this makes it work.

FYI mesa master has regressions for Android because of the overall
changes happened but this patch at least makes SurfaceFlinger work, I'm
working on bisecting other issues.


> 
> -- 
> Adrian Marius Negreanu
> Open Source Technology Center 
> iNET: 88451009  Desk: +40 31 86 04 709
> 
> 


-- 

// Tapani


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 551 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20121003/dcc3d93b/attachment-0001.pgp>