Acked-by: Jason Ekstrand <ja...@jlekstrand.net> Maybe one of the android people would like to test it?
On Fri, May 12, 2017 at 4:38 PM, Anuj Phogat <anuj.pho...@gmail.com> wrote: > Note: This patch is untested. > > Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com> > --- > src/intel/Android.genxml.mk | 5 +++++ > src/intel/Android.isl.mk | 20 ++++++++++++++++++++ > src/intel/Android.vulkan.mk | 21 +++++++++++++++++++++ > src/mesa/drivers/dri/i965/Android.mk | 24 +++++++++++++++++++++++- > 4 files changed, 69 insertions(+), 1 deletion(-) > > diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk > index 4b0746c..e4d8dd8 100644 > --- a/src/intel/Android.genxml.mk > +++ b/src/intel/Android.genxml.mk > @@ -96,6 +96,11 @@ $(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := > $(LOCAL_PATH)/genxml/gen9.xm > $(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml > $(LOCAL_PATH)/genxml/gen_pack_header.py > $(call header-gen) > > +$(intermediates)/genxml/gen10_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) > $(LOCAL_PATH)/genxml/gen_pack_header.py > +$(intermediates)/genxml/gen10_pack.h: PRIVATE_XML := > $(LOCAL_PATH)/genxml/gen10.xml > +$(intermediates)/genxml/gen10_pack.h: $(LOCAL_PATH)/genxml/gen10.xml > $(LOCAL_PATH)/genxml/gen_pack_header.py > + $(call header-gen) > + > $(intermediates)/genxml/genX_xml.h: $(addprefix > $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) > $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py > @mkdir -p $(dir $@) > @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" > diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk > index 67e6d2d..516ac3a 100644 > --- a/src/intel/Android.isl.mk > +++ b/src/intel/Android.isl.mk > @@ -161,6 +161,25 @@ include $(MESA_COMMON_MK) > include $(BUILD_STATIC_LIBRARY) > > # --------------------------------------- > +# Build libmesa_isl_gen10 > +# --------------------------------------- > + > +include $(CLEAR_VARS) > + > +LOCAL_MODULE := libmesa_isl_gen10 > + > +LOCAL_SRC_FILES := $(ISL_GEN10_FILES) > + > +LOCAL_CFLAGS := -DGEN_VERSIONx10=100 > + > +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) > + > +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml > + > +include $(MESA_COMMON_MK) > +include $(BUILD_STATIC_LIBRARY) > + > +# --------------------------------------- > # Build libmesa_isl > # --------------------------------------- > > @@ -187,6 +206,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ > libmesa_isl_gen75 \ > libmesa_isl_gen8 \ > libmesa_isl_gen9 \ > + libmesa_isl_gen10 \ > libmesa_genxml > > # Autogenerated sources > diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk > index 831b658..566db29 100644 > --- a/src/intel/Android.vulkan.mk > +++ b/src/intel/Android.vulkan.mk > @@ -158,6 +158,26 @@ include $(MESA_COMMON_MK) > include $(BUILD_STATIC_LIBRARY) > > # > +# libanv for gen10 > +# > + > +include $(CLEAR_VARS) > +LOCAL_MODULE := libmesa_anv_gen10 > +LOCAL_MODULE_CLASS := STATIC_LIBRARIES > + > +LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES) > +LOCAL_CFLAGS := -DGEN_VERSIONx10=100 > + > +LOCAL_C_INCLUDES := $(ANV_INCLUDES) > + > +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml > + > +LOCAL_SHARED_LIBRARIES := libdrm > + > +include $(MESA_COMMON_MK) > +include $(BUILD_STATIC_LIBRARY) > + > +# > # libmesa_vulkan_common > # > > @@ -228,6 +248,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ > libmesa_anv_gen75 \ > libmesa_anv_gen8 \ > libmesa_anv_gen9 \ > + libmesa_anv_gen10 \ > libmesa_intel_compiler \ > libmesa_anv_entrypoints > > diff --git a/src/mesa/drivers/dri/i965/Android.mk > b/src/mesa/drivers/dri/i965/Android.mk > index 7c4fada..7ee9ab7 100644 > --- a/src/mesa/drivers/dri/i965/Android.mk > +++ b/src/mesa/drivers/dri/i965/Android.mk > @@ -47,7 +47,8 @@ I965_PERGEN_LIBS := \ > libmesa_i965_gen7 \ > libmesa_i965_gen75 \ > libmesa_i965_gen8 \ > - libmesa_i965_gen9 > + libmesa_i965_gen9 \ > + libmesa_i965_gen10 > > # --------------------------------------- > # Build libmesa_i965_gen4 > @@ -218,6 +219,27 @@ include $(MESA_COMMON_MK) > include $(BUILD_STATIC_LIBRARY) > > # --------------------------------------- > +# Build libmesa_i965_gen10 > +# --------------------------------------- > + > +include $(CLEAR_VARS) > + > +LOCAL_MODULE := libmesa_i965_gen10 > + > +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) > + > +LOCAL_SRC_FILES := $(i965_gen10_FILES) > + > +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) > + > +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) > + > +LOCAL_CFLAGS := -DGEN_VERSIONx10=100 > + > +include $(MESA_COMMON_MK) > +include $(BUILD_STATIC_LIBRARY) > + > +# --------------------------------------- > # Build i965_dri > # --------------------------------------- > > -- > 2.9.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
