On Mon, Feb 1, 2016 at 4:37 PM, Mauro Rossi <issor.or...@gmail.com> wrote: > This android specific patch solves several building errors > introduced by commit that moved glsl to src/compiler/ folder > and fixes also the building errors due to nir and compiler > carve out from old libmesa_glsl. > > Here follows the changelog: > > the now non-existent src/glsl subfolder was removed from ./Android.mk > > compiler/Android.mk was updated to invoke compiler/glsl/Android.mk > > proper includes were set to account for new compiler/glsl folder > > 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. > --- > Android.mk | 1 - > src/compiler/Android.mk | 6 ++++++ > src/compiler/glsl/Android.gen.mk | 2 +- > src/compiler/glsl/Android.mk | 5 ++--- > src/gallium/auxiliary/Android.mk | 4 ++-- > src/gallium/drivers/freedreno/Android.mk | 2 +- > src/gallium/drivers/r300/Android.mk | 2 +- > src/gallium/drivers/vc4/Android.mk | 4 ++-- I missed building this one. > src/gallium/targets/dri/Android.mk | 2 ++ > src/mesa/Android.libmesa_glsl_utils.mk | 4 ++-- > src/mesa/Android.libmesa_st_mesa.mk | 2 +- > src/mesa/Android.mesa_gen_matypes.mk | 2 +- > src/mesa/drivers/dri/Android.mk | 2 ++ > src/mesa/program/Android.mk | 4 ++-- > 14 files changed, 25 insertions(+), 17 deletions(-) [...] > diff --git a/src/gallium/auxiliary/Android.mk > b/src/gallium/auxiliary/Android.mk > index 86430eb..9255a7e 100644 > --- a/src/gallium/auxiliary/Android.mk > +++ b/src/gallium/auxiliary/Android.mk > @@ -44,9 +44,9 @@ LOCAL_SRC_FILES += \ > LOCAL_CPPFLAGS := -std=c++11 > endif > > -# 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. > # generate sources > LOCAL_MODULE_CLASS := STATIC_LIBRARIES > diff --git a/src/gallium/drivers/freedreno/Android.mk > b/src/gallium/drivers/freedreno/Android.mk > index ed51835..3eb412f 100644 > --- a/src/gallium/drivers/freedreno/Android.mk > +++ b/src/gallium/drivers/freedreno/Android.mk > @@ -39,7 +39,7 @@ LOCAL_C_INCLUDES := \ > $(LOCAL_PATH)/ir3 > > LOCAL_SHARED_LIBRARIES := libdrm libdrm_freedreno > -LOCAL_STATIC_LIBRARIES := libmesa_glsl > +LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir > LOCAL_MODULE := libmesa_pipe_freedreno > > include $(GALLIUM_COMMON_MK) > diff --git a/src/gallium/drivers/r300/Android.mk > b/src/gallium/drivers/r300/Android.mk > index 7ff4f86..06c7714 100644 > --- a/src/gallium/drivers/r300/Android.mk > +++ b/src/gallium/drivers/r300/Android.mk > @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(C_SOURCES) > > 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. > $(MESA_TOP)/src/mesa > > > diff --git a/src/gallium/drivers/vc4/Android.mk > b/src/gallium/drivers/vc4/Android.mk > index f42a152..1f4d49a 100644 > --- a/src/gallium/drivers/vc4/Android.mk > +++ b/src/gallium/drivers/vc4/Android.mk > @@ -29,8 +29,8 @@ LOCAL_SRC_FILES := \ > $(C_SOURCES) > > LOCAL_SHARED_LIBRARIES := libdrm > -# We need libmesa_glsl to get NIR's generated include directories. > -LOCAL_STATIC_LIBRARIES := libmesa_glsl > +# We need libmesa_nir to get NIR's generated include directories. > +LOCAL_STATIC_LIBRARIES := libmesa_nir > LOCAL_MODULE := libmesa_pipe_vc4 > > include $(GALLIUM_COMMON_MK) > diff --git a/src/gallium/targets/dri/Android.mk > b/src/gallium/targets/dri/Android.mk > index d403085..0c59704 100644 > --- a/src/gallium/targets/dri/Android.mk > +++ b/src/gallium/targets/dri/Android.mk > @@ -109,6 +109,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ > libmesa_st_dri \ > libmesa_st_mesa \ > libmesa_glsl \ > + libmesa_nir \ > + libmesa_compiler \ > libmesa_dri_common \ > libmesa_megadriver_stub \ > libmesa_gallium \ > diff --git a/src/mesa/Android.libmesa_glsl_utils.mk > b/src/mesa/Android.libmesa_glsl_utils.mk > index 894ae20..dc62e4a 100644 > --- a/src/mesa/Android.libmesa_glsl_utils.mk > +++ b/src/mesa/Android.libmesa_glsl_utils.mk > @@ -36,7 +36,7 @@ include $(CLEAR_VARS) > LOCAL_MODULE := libmesa_glsl_utils > > LOCAL_C_INCLUDES := \ > - $(MESA_TOP)/src/glsl \ > + $(MESA_TOP)/src/compiler/glsl \ Same here. > $(MESA_TOP)/src/compiler/nir \ > $(MESA_TOP)/src/mapi \ > $(MESA_TOP)/src/gallium/include \ > @@ -62,7 +62,7 @@ LOCAL_IS_HOST_MODULE := true > LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L > > LOCAL_C_INCLUDES := \ > - $(MESA_TOP)/src/glsl \ > + $(MESA_TOP)/src/compiler/glsl \ And here. > $(MESA_TOP)/src/compiler/nir \ > $(MESA_TOP)/src/mapi \ > $(MESA_TOP)/src/gallium/include \ > diff --git a/src/mesa/Android.libmesa_st_mesa.mk > b/src/mesa/Android.libmesa_st_mesa.mk > index 49e81a5..a0e19bf 100644 > --- a/src/mesa/Android.libmesa_st_mesa.mk > +++ b/src/mesa/Android.libmesa_st_mesa.mk > @@ -58,7 +58,7 @@ endif > LOCAL_C_INCLUDES := \ > $(MESA_TOP)/src/mapi \ > $(MESA_TOP)/src/mesa/main \ > - $(MESA_TOP)/src/glsl \ > + $(MESA_TOP)/src/compiler/glsl \ And here. > $(MESA_TOP)/src/compiler/nir \ > $(MESA_TOP)/src/gallium/auxiliary \ > $(MESA_TOP)/src/gallium/include > diff --git a/src/mesa/Android.mesa_gen_matypes.mk > b/src/mesa/Android.mesa_gen_matypes.mk > index 6e301f9..1292908 100644 > --- a/src/mesa/Android.mesa_gen_matypes.mk > +++ b/src/mesa/Android.mesa_gen_matypes.mk > @@ -36,7 +36,7 @@ LOCAL_IS_HOST_MODULE := true > > LOCAL_C_INCLUDES := \ > $(MESA_TOP)/src/mapi \ > - $(MESA_TOP)/src/glsl > + $(MESA_TOP)/src/compiler/glsl And here. > > LOCAL_SRC_FILES := \ > x86/gen_matypes.c > diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk > index 42bfd77..33fdc98 100644 > --- a/src/mesa/drivers/dri/Android.mk > +++ b/src/mesa/drivers/dri/Android.mk > @@ -42,6 +42,8 @@ MESA_DRI_C_INCLUDES := \ > > MESA_DRI_WHOLE_STATIC_LIBRARIES := \ > libmesa_glsl \ > + libmesa_nir \ > + libmesa_compiler \ > libmesa_megadriver_stub \ > libmesa_dri_common \ > libmesa_dricore \ > diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk > index 0bc97a6..d2cd707 100644 > --- a/src/mesa/program/Android.mk > +++ b/src/mesa/program/Android.mk > @@ -44,7 +44,7 @@ include $(CLEAR_VARS) > > LOCAL_MODULE := libmesa_program > LOCAL_MODULE_CLASS := STATIC_LIBRARIES > -LOCAL_STATIC_LIBRARIES := libmesa_glsl > +LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir > > intermediates := $(call local-generated-sources-dir) > > @@ -74,7 +74,7 @@ $(intermediates)/program/lex.yy.c: > $(LOCAL_PATH)/program_lexer.l > LOCAL_C_INCLUDES := \ > $(MESA_TOP)/src/mapi \ > $(MESA_TOP)/src/mesa \ > - $(MESA_TOP)/src/glsl \ > + $(MESA_TOP)/src/compiler/glsl \ And here. > $(MESA_TOP)/src/compiler/nir \ > $(MESA_TOP)/src/gallium/auxiliary \ > $(MESA_TOP)/src/gallium/include > -- > 2.5.0 > > -- > You received this message because you are subscribed to the Google Groups > "Android-x86 development" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to android-x86-devel+unsubscr...@googlegroups.com. > To post to this group, send email to android-x86-de...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/android-x86-devel/1454366264-24386-4-git-send-email-issor.oruam%40gmail.com. > For more options, visit https://groups.google.com/d/optout. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev