Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
> > My last problem was probably due to uncleaned mesa targets folders in > $OUT > > path, > > now I have checked again and building errors are gone. > > > You might want to take a look and update the CleanSpec.mk for that. > I've pushed the one-liner to master - do we want it in stable (11.0.x) > as well ? I'm not sure which branch android-x86 current follows. > > Cheers, > Emil > Hi Emil, I'll check CleanSpec.mk The patch is needed only in master, building errors related to missing glsl_types.h never happened in mesa 11.0 branch. lollipop-x86 branch is using mesa 11.0.3 Thanks a lot Regards Mauro ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
On 14 November 2015 at 14:43, Mauro Rossi wrote: > Hi Emil, > > I checked with Chih-Wei and LOCAL_EXPORT_C_INCLUDE_DIRS is the preferred > way. > > I took the chance to finally understand why the single line of change you > proposed will suffice, > it's because glsl_compiler module invokes libmesa_glsl as static library and > the same applies to i965_dri module. > > My last problem was probably due to uncleaned mesa targets folders in $OUT > path, > now I have checked again and building errors are gone. > You might want to take a look and update the CleanSpec.mk for that. I've pushed the one-liner to master - do we want it in stable (11.0.x) as well ? I'm not sure which branch android-x86 current follows. Cheers, Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
Hi Emil, I checked with Chih-Wei and LOCAL_EXPORT_C_INCLUDE_DIRS is the preferred way. I took the chance to finally understand why the single line of change you proposed will suffice, it's because glsl_compiler module invokes libmesa_glsl as static library and the same applies to i965_dri module. My last problem was probably due to uncleaned mesa targets folders in $OUT path, now I have checked again and building errors are gone. Thanks a lot Emil and Chih-Wei Mauro 2015-11-08 14:12 GMT+01:00 Emil Velikov : > Hi Mauro, > > On 8 November 2015 at 12:59, Mauro Rossi wrote: > > Update2: I'm getting the building error in both x86 target and x86_64 > > target. > > > > I'm relieved it's not arch dependend, I suspect that export will require > a > > dependency to be declared, > > because if i965_dri module is built before glsl ones we will have the > > error. > > > > The LOCAL_C_INCLUDES even if not elegant, avoided the problem in the > first > > place, > > but I'd like to learn the by the best practice and apply it in the > future. > > > Fwiw I'm all for LOCAL_C_INCLUDES (I even mentioned a few times a way > that we can share those and minimise these issues), but I believe > Chih-Wei was not really a fan of them. If he's ok with it I'll push > your original patch. > > Regards, > Emil > > P.S. Typos - for each one we fix, another we introduce another one or > more :-P > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
Hi Mauro, On 8 November 2015 at 12:59, Mauro Rossi wrote: > Update2: I'm getting the building error in both x86 target and x86_64 > target. > > I'm relieved it's not arch dependend, I suspect that export will require a > dependency to be declared, > because if i965_dri module is built before glsl ones we will have the > error. > > The LOCAL_C_INCLUDES even if not elegant, avoided the problem in the first > place, > but I'd like to learn the by the best practice and apply it in the future. > Fwiw I'm all for LOCAL_C_INCLUDES (I even mentioned a few times a way that we can share those and minimise these issues), but I believe Chih-Wei was not really a fan of them. If he's ok with it I'll push your original patch. Regards, Emil P.S. Typos - for each one we fix, another we introduce another one or more :-P ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
Update2: I'm getting the building error in both x86 target and x86_64 target. I'm relieved it's not arch dependend, I suspect that export will require a dependency to be declared, because if i965_dri module is built before glsl ones we will have the error. The LOCAL_C_INCLUDES even if not elegant, avoided the problem in the first place, but I'd like to learn the by the best practice and apply it in the future. Emil, Chih-Wei what is your thought on this? Added also other android-x86 developers in CC Mauro In file included from external/mesa/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp:34:0: external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory #include "glsl_types.h" ^ compilation terminated. build/core/binary.mk:620: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cubemap_normalize.o' failed make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cubemap_normalize.o] Error 1 make: *** Waiting for unfinished jobs target C++: i965_dri <= external/mesa/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp In file included from external/mesa/src/mesa/drivers/dri/i965/brw_shader.h:29:0, from external/mesa/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp:29: external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory #include "glsl_types.h" ^ compilation terminated. In file included from external/mesa/src/mesa/drivers/dri/i965/brw_shader.h:29:0, from external/mesa/src/mesa/drivers/dri/i965/brw_cfg.h:32, from external/mesa/src/mesa/drivers/dri/i965/brw_cfg.cpp:28: external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory #include "glsl_types.h" ^ compilation terminated. build/core/binary.mk:620: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_dead_control_flow.o' failed make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_dead_control_flow.o] Error 1 build/core/binary.mk:620: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cfg.o' failed make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cfg.o] Error 1 In file included from external/mesa/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp:46:0: external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory #include "glsl_types.h" ^ compilation terminated. build/core/binary.mk:620: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_fs_channel_expressions.o' failed make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_fs_channel_expressions.o] Error 1 2015-11-08 13:36 GMT+01:00 Mauro Rossi : > Hi, > > Sending an update because with the export android_x86 target builds ok, > but I'm getting again the "glsl_types.h not found" building error with > android_x86_64 target (specifically for 64 bit modules). > > I'll report as soon I may be able to understand what's going on, > added other android-x86 developers in CC. > > Mauro > > 2015-11-07 1:29 GMT+01:00 Mauro Rossi : > >> 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 : >> >>> Hi Mauro >>> >>> On 6 November 2015 at 03:31, Mauro Rossi 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/
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
Hi, Sending an update because with the export android_x86 target builds ok, but I'm getting again the "glsl_types.h not found" building error with android_x86_64 target (specifically for 64 bit modules). I'll report as soon I may be able to understand what's going on, added other android-x86 developers in CC. Mauro 2015-11-07 1:29 GMT+01:00 Mauro Rossi : > 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 : > >> Hi Mauro >> >> On 6 November 2015 at 03:31, Mauro Rossi 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 >> > > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
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 : > Hi Mauro > > On 6 November 2015 at 03:31, Mauro Rossi 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 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
Re: [Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
Hi Mauro On 6 November 2015 at 03:31, Mauro Rossi 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 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h
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) \ -- 2.5.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
