[Mesa-dev] [PATCH] android: nouveau: add support for nir

[Mauro Rossi]

Hi Karol,

On Sun, Mar 17, 2019 at 11:25 PM Karol Herbst <kherbst at redhat.com> wrote:
>
> On Sun, Mar 17, 2019 at 10:52 PM Mauro Rossi <issor.oruam at gmail.com> wrote:
> >
> > Add the necessary build rules for android, to avoid building errors.
> >
> > Fixes: f014ae3 ("nouveau: add support for nir")
> > Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
> > ---
> >  src/gallium/drivers/nouveau/Android.mk | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
> > index cd2dd0938f..49a341c831 100644
> > --- a/src/gallium/drivers/nouveau/Android.mk
> > +++ b/src/gallium/drivers/nouveau/Android.mk
> > @@ -37,8 +37,13 @@ LOCAL_SRC_FILES := \
> >         $(NVC0_C_SOURCES)
> >
> >  LOCAL_C_INCLUDES := \
> > -       $(MESA_TOP)/include
> > +       $(MESA_TOP)/include \
> > +       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
> > +       $(MESA_TOP)/src/compiler/nir \
> > +       $(MESA_TOP)/src/mapi \
> > +       $(MESA_TOP)/src/mesa
>
> do we really have to add all those includes? freedreno doesn't seem to
> add those either and just has the libmesa_nir dependency

Hi Karol,

the first build error "main/config.h" not found
was caused by $(MESA_TOP)/src/mesa missing,
then I did not chased the others,
I replicated with fidelity your Autotools build rules
as I've always been instructed this way by Emil Velikov

The patch is working and Android booting on GTX950 with the patch
KR

Mauro

>
> >
> > +LOCAL_STATIC_LIBRARIES := libmesa_nir
> >  LOCAL_SHARED_LIBRARIES := libdrm_nouveau
> >  LOCAL_MODULE := libmesa_pipe_nouveau
> >
> > --
> > 2.19.1
> >