[Mesa-dev] [android-x86-devel] [PATCH 4/5] android: fix building with new glsl, nir, compiler libraries

[Mauro Rossi]

Hi,

> per each target that depended on the old libmesa_glsl static,
> > dependencies were checked and updated according to the new
> > libmesa_glsl, libmesa_nir and libmesa_compiler static libraries
>
> Looks pretty similar to my changes except for a few things.
>


...
>


 >  src/gallium/drivers/vc4/Android.mk       | 4 ++--
> I missed building this one.



I went through all android building errors occurences,
with the following list of drivers BoardConfig.mk:

freedreeno i915 i965 *nouveau* r300g r600g *radeonsi* swrast virgl *vc4*

Compared to you list of changes, only *vc4* had glsl related building error.

I also tried to build vmwgfx drivers, which have dependencies on libLLVM
shared library, but when building vmwgfx linking fails, there are a lot of
building errors all of them are undefined reference to LLVM functions.

With kitkat-x86, vmwgfx of mesa 11.2.0devel is built without a glitch.

Do you have any clue or advice on how to build vmwgfx on
lollipop/marshmallow?

Thanks in advance


> -# We need libmesa_glsl to get NIR's generated include directories.
> > +# We need libmesa_nir to get NIR's generated include directories.
> >  LOCAL_MODULE := libmesa_gallium
> > -LOCAL_STATIC_LIBRARIES += libmesa_glsl
> > +LOCAL_STATIC_LIBRARIES += libmesa_nir
>
> I just added libmesa_nir, but this is probably the correct fix.


I saw no no building error when removing libmesa_glsl


> >  LOCAL_C_INCLUDES := \
> >         $(MESA_TOP)/src/mapi \
> > -       $(MESA_TOP)/src/glsl \
> > +       $(MESA_TOP)/src/compiler/glsl \
>
> Are you sure this path is needed? I didn't seem to need it.


I performed the changes based on the assumption that $(MESA_TOP)/src/glsl
is now a non existent path,
but marshamallow is built even without $(MESA_TOP)/src/glsl or
$(MESA_TOP)/src/compiler/glsl

IIRC that line in the includes path was needed in the past to avoid
building errors,
it may be related to kikat-x86 build system, but I need to check next
weekend, when I'll move to where I have the build machine for kitkat-x86.

For the moment, I would recommed to keep it with the new corrected path in
any place it appears.
Thanks a lot

Mauro
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20160203/b8435609/attachment.html>