AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965/cnl: Wire up android Mesa build files for gen10

Browse Source 
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Anuj Phogat
2017-05-11 11:57:11 -07:00
parent e01c5a6824
commit dc83ce7a16
4 changed files with 69 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/Android.genxml.mk
+5
View File
@@ -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 $(@))"
src/intel/Android.isl.mk
+20
View File
@@ -160,6 +160,25 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
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
src/intel/Android.vulkan.mk
+21
View File
@@ -158,6 +158,26 @@ LOCAL_SHARED_LIBRARIES := libdrm
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
#
@@ -231,6 +251,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_anv_gen75 \
libmesa_anv_gen8 \
libmesa_anv_gen9 \
libmesa_anv_gen10 \
libmesa_intel_compiler \
libmesa_anv_entrypoints
src/mesa/drivers/dri/i965/Android.mk
+23 -1
View File
@@ -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
@@ -217,6 +218,27 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=90
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
# ---------------------------------------