diff options
| author | Anuj Phogat <[email protected]> | 2017-05-11 11:57:11 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2017-06-09 16:02:58 -0700 |
| commit | dc83ce7a163b585809032ee851b9c2a438021cfb (patch) | |
| tree | 6f410a818463a1f7383fcdc12d20de7178d99528 /src/intel | |
| parent | e01c5a6824cdc8578acc6cebd2ac1baabccb5807 (diff) | |
i965/cnl: Wire up android Mesa build files for gen10
Signed-off-by: Anuj Phogat <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Mauro Rossi <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/Android.genxml.mk | 5 | ||||
| -rw-r--r-- | src/intel/Android.isl.mk | 20 | ||||
| -rw-r--r-- | src/intel/Android.vulkan.mk | 21 |
3 files changed, 46 insertions, 0 deletions
diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk index 4b0746c245b..e4d8dd8b945 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 67e6d2de193..516ac3a2102 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 e31c4391df0..095a75bbd47 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -159,6 +159,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 # @@ -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 |