glx/test: meson: assorted include fixes

[mesa.git] / src / intel / Android.vulkan.mk

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 2ede3f75b3206dcd251ba4f2c470cabd46cbf69a..db81fada27796e2d11e212ca1ec280165f6d8fae 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -25,14 +25,20 @@ include $(LOCAL_PATH)/Makefile.sources
 
 VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_entrypoints_gen.py
 
+VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_extensions_gen.py
+
 VULKAN_COMMON_INCLUDES := \
+       $(MESA_TOP)/include \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/vulkan/wsi \
+       $(MESA_TOP)/src/vulkan/util \
        $(MESA_TOP)/src/intel \
-       $(MESA_TOP)/src/intel/vulkan
+       $(MESA_TOP)/include/drm-uapi \
+       $(MESA_TOP)/src/intel/vulkan \
+       frameworks/native/vulkan/include
 
 # libmesa_anv_entrypoints with header and dummy.c
 #
@@ -75,8 +81,15 @@ ANV_INCLUDES := \
        $(VULKAN_COMMON_INCLUDES) \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
 
+ANV_SHARED_LIBRARIES := libdrm
+
+ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+ANV_SHARED_LIBRARIES += libnativewindow
+endif
+
 #
 # libanv for gen7
 #
@@ -92,7 +105,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -112,7 +125,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -132,7 +145,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -152,7 +165,47 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
+
+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 := $(ANV_SHARED_LIBRARIES)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# libanv for gen11
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen11
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=110
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -176,6 +229,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_anv_entrypoints \
        libmesa_genxml \
+       libmesa_git_sha1 \
        libmesa_vulkan_util
 
 # The rule generates both C and H files, but due to some strange
@@ -184,6 +238,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 # conditions since they are stored in another location.
 
 LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.h
 
 $(intermediates)/vulkan/anv_entrypoints.c:
        @mkdir -p $(dir $@)
@@ -191,7 +247,19 @@ $(intermediates)/vulkan/anv_entrypoints.c:
                --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
                --outdir $(dir $@)
 
-LOCAL_SHARED_LIBRARIES := libdrm
+$(intermediates)/vulkan/anv_extensions.c:
+       @mkdir -p $(dir $@)
+       $(VK_EXTENSIONS_SCRIPT) \
+               --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
+               --out-c $@
+
+$(intermediates)/vulkan/anv_extensions.h:
+       @mkdir -p $(dir $@)
+       $(VK_EXTENSIONS_SCRIPT) \
+               --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
+               --out-h $@
+
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -203,17 +271,21 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libvulkan_intel
+LOCAL_MODULE := vulkan.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := hw
 
 LOCAL_LDFLAGS += -Wl,--build-id=sha1
 
 LOCAL_SRC_FILES := \
-       $(VULKAN_GEM_FILES)
+       $(VULKAN_GEM_FILES) \
+       $(VULKAN_ANDROID_FILES)
 
 LOCAL_C_INCLUDES := \
        $(VULKAN_COMMON_INCLUDES) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan
 
@@ -225,15 +297,18 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_blorp \
        libmesa_compiler \
        libmesa_intel_common \
+       libmesa_intel_dev \
        libmesa_vulkan_common \
        libmesa_anv_gen7 \
        libmesa_anv_gen75 \
        libmesa_anv_gen8 \
        libmesa_anv_gen9 \
+       libmesa_anv_gen10 \
+       libmesa_anv_gen11 \
        libmesa_intel_compiler \
        libmesa_anv_entrypoints
 
-LOCAL_SHARED_LIBRARIES := libdrm libz
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog
 
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)