Hi Emil, by exporting the path of glsl nir headers, mesa builds without problems.
You can find in the attachment the formatted patch. Thanks Mauro 2015-11-06 18:26 GMT+01:00 Emil Velikov <emil.l.veli...@gmail.com>: > Hi Mauro > > On 6 November 2015 at 03:31, Mauro Rossi <issor.or...@gmail.com> wrote: > > These changes are necessary to avoid building errors in glsl and i965 > > --- > > src/glsl/Android.mk | 6 ++++-- > > src/mesa/drivers/dri/i965/Android.mk | 3 ++- > > 2 files changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk > > index f63b7da..6902ea4 100644 > > --- a/src/glsl/Android.mk > > +++ b/src/glsl/Android.mk > > @@ -42,7 +42,8 @@ LOCAL_C_INCLUDES := \ > > $(MESA_TOP)/src/mapi \ > > $(MESA_TOP)/src/mesa \ > > $(MESA_TOP)/src/gallium/include \ > > - $(MESA_TOP)/src/gallium/auxiliary > > + $(MESA_TOP)/src/gallium/auxiliary \ > > + $(MESA_TOP)/src/glsl/nir > > > > LOCAL_MODULE := libmesa_glsl > > > > @@ -63,7 +64,8 @@ LOCAL_C_INCLUDES := \ > > $(MESA_TOP)/src/mapi \ > > $(MESA_TOP)/src/mesa \ > > $(MESA_TOP)/src/gallium/include \ > > - $(MESA_TOP)/src/gallium/auxiliary > > + $(MESA_TOP)/src/gallium/auxiliary \ > > + $(MESA_TOP)/src/glsl/nir > > > > LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util > > > > diff --git a/src/mesa/drivers/dri/i965/Android.mk > b/src/mesa/drivers/dri/i965/Android.mk > > index d30a053..f9a914a 100644 > > --- a/src/mesa/drivers/dri/i965/Android.mk > > +++ b/src/mesa/drivers/dri/i965/Android.mk > > @@ -45,7 +45,8 @@ LOCAL_CFLAGS += \ > > endif > > > > LOCAL_C_INCLUDES := \ > > - $(MESA_DRI_C_INCLUDES) > > + $(MESA_DRI_C_INCLUDES) \ > > + $(MESA_TOP)/src/glsl/nir > > > > LOCAL_SRC_FILES := \ > > $(i965_compiler_FILES) \ > > Following the Android way of exporting includes I believe you want the > following > > diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk > index 6898fb0..59cc857 100644 > --- a/src/glsl/Android.gen.mk > +++ b/src/glsl/Android.gen.mk > @@ -38,7 +38,8 @@ LOCAL_C_INCLUDES += \ > $(MESA_TOP)/src/glsl/nir > > LOCAL_EXPORT_C_INCLUDE_DIRS += \ > - $(intermediates)/nir > + $(intermediates)/nir \ > + $(MESA_TOP)/src/glsl/nir > > LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ > $(LIBGLCPP_GENERATED_FILES) \ > > > Formatting might be broken (thanks gmail), although the gist is there. > Can you give it a try (note the order is important) > > Thanks > Emil >
From 4afd21bdd79811d65163eeedc24fc2ef4295630d Mon Sep 17 00:00:00 2001 From: Mauro Rossi <issor.or...@gmail.com> Date: Sat, 7 Nov 2015 01:23:46 +0100 Subject: [PATCH] android: export the path of glsl nir headers The change is necessary to avoid building errors in glsl and i965 modules due to missing glsl_types.h header --- src/glsl/Android.gen.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index 6898fb0..59cc857 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -38,7 +38,8 @@ LOCAL_C_INCLUDES += \ $(MESA_TOP)/src/glsl/nir LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(intermediates)/nir + $(intermediates)/nir \ + $(MESA_TOP)/src/glsl/nir LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(LIBGLCPP_GENERATED_FILES) \ -- 2.5.0
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
