[Mesa-dev] [PATCH v4] android: add vulkan build for intel

Mon Jan 30 11:37:47 UTC 2017

fixes to issues spotted by Emil Velikov:

   - set ANV_TIMESTAMP corretly
   - fix typo with VULKAN_GEM_FILES

v2: update to use Makefile.sources under vulkan
    instead of having own

v3: update to changes to generate from vk.xml
    (commit c7fc310)

v4: remove 'hw' relative path
    cleanups, remove unnecessary cruft

    review from Emil Velikov:

    - move to vulkan folder
    - remove timestamp gen, no longer necessary
    - more cleanups

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 src/intel/Android.mk        |   1 +
 src/intel/vulkan/Android.mk | 226 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 227 insertions(+)
 create mode 100644 src/intel/vulkan/Android.mk

diff --git a/src/intel/Android.mk b/src/intel/Android.mk
index 3d501ab..147f5a7 100644
--- a/src/intel/Android.mk
+++ b/src/intel/Android.mk
@@ -29,3 +29,4 @@ include $(LOCAL_PATH)/Android.blorp.mk
 include $(LOCAL_PATH)/Android.common.mk
 include $(LOCAL_PATH)/Android.genxml.mk
 include $(LOCAL_PATH)/Android.isl.mk
+include $(LOCAL_PATH)/vulkan/Android.mk
diff --git a/src/intel/vulkan/Android.mk b/src/intel/vulkan/Android.mk
new file mode 100644
index 0000000..1e53970
--- /dev/null
+++ b/src/intel/vulkan/Android.mk
@@ -0,0 +1,226 @@
+# Copyright © 2017 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Makefile.sources
+
+VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/anv_entrypoints_gen.py
+
+VULKAN_COMMON_INCLUDES := \
+	$(MESA_TOP)/include/vulkan \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/gallium/auxiliary \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/mesa \
+	$(MESA_TOP)/src/mesa/drivers/dri/common \
+	$(MESA_TOP)/src/mesa/drivers/dri/i965 \
+	$(MESA_TOP)/src/vulkan/wsi \
+	$(MESA_TOP)/src/intel/vulkan
+
+# libmesa_anv_entrypoints with header and dummy.c
+#
+# This static library is built to pull entrypoints header
+# for multiple gen specific build targets below. The c file
+# is generated separately for libmesa_vulkan_common to avoid
+# duplicate symbols when linking the anv libraries.
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_entrypoints
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir)
+
+LOCAL_C_INCLUDES := \
+	$(VULKAN_COMMON_INCLUDES)
+
+LOCAL_GENERATED_SOURCES += $(intermediates)/anv_entrypoints.h
+LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c
+
+$(intermediates)/dummy.c:
+	@mkdir -p $(dir $@)
+	@echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	$(hide) touch $@
+
+$(intermediates)/anv_entrypoints.h:
+	$(hide) cat $(MESA_TOP)/src/vulkan/registry/vk.xml | $(VK_ENTRYPOINTS_SCRIPT) header > $@
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+        $(intermediates)
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+ANV_INCLUDES := \
+	$(VULKAN_COMMON_INCLUDES) \
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,) \
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir
+
+#
+# libanv for gen7
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen7
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(GEN7_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=70
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# libanv for gen75
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen75
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(GEN75_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=75
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# libanv for gen8
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen8
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(GEN8_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=80
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# libanv for gen9
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen9
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(GEN9_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=90
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# libmesa_vulkan_common
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_vulkan_common
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir)
+
+LOCAL_SRC_FILES := $(VULKAN_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(ANV_INCLUDES) \
+	$(MESA_TOP)/src/compiler
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_GENERATED_SOURCES += $(intermediates)/anv_entrypoints.c
+
+$(intermediates)/anv_entrypoints.c:
+	$(hide) cat $(MESA_TOP)/src/vulkan/registry/vk.xml | $(VK_ENTRYPOINTS_SCRIPT) code > $@
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+
+#
+# vulkan.mesa_intel
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := vulkan.mesa_intel
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+LOCAL_SRC_FILES := \
+	$(VULKAN_GEM_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(VULKAN_COMMON_INCLUDES) \
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+	libmesa_nir \
+	libmesa_isl \
+	libmesa_glsl \
+	libmesa_util \
+	libmesa_blorp \
+	libmesa_compiler \
+	libmesa_intel_common \
+	libmesa_vulkan_common \
+	libmesa_anv_gen7 \
+	libmesa_anv_gen75 \
+	libmesa_anv_gen8 \
+	libmesa_anv_gen9 \
+	libmesa_i965_compiler \
+	libmesa_anv_entrypoints
+
+LOCAL_SHARED_LIBRARIES := \
+	libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_SHARED_LIBRARY)
-- 
2.9.3

