spirv: Use NIR per-member splitting

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

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 07e69d890a55bca523981f9a2058d2db6461b569..09dc22875a1f3c1da9b32492de43a3b951516acd 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -67,8 +67,7 @@ $(intermediates)/vulkan/dummy.c:
 $(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c
        $(VK_ENTRYPOINTS_SCRIPT) \
                --outdir $(dir $@) \
-               --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
-               --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml
+               --xml $(MESA_TOP)/src/vulkan/registry/vk.xml
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         $(intermediates)
@@ -199,7 +198,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen11
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
 LOCAL_CFLAGS := -DGEN_VERSIONx10=110
 
 LOCAL_C_INCLUDES := $(ANV_INCLUDES)
@@ -245,21 +244,18 @@ $(intermediates)/vulkan/anv_entrypoints.c:
        @mkdir -p $(dir $@)
        $(VK_ENTRYPOINTS_SCRIPT) \
                --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
-               --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
                --outdir $(dir $@)
 
 $(intermediates)/vulkan/anv_extensions.c:
        @mkdir -p $(dir $@)
        $(VK_EXTENSIONS_SCRIPT) \
                --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
-               --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
                --out-c $@
 
 $(intermediates)/vulkan/anv_extensions.h:
        @mkdir -p $(dir $@)
        $(VK_EXTENSIONS_SCRIPT) \
                --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
-               --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
                --out-h $@
 
 LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
@@ -300,6 +296,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_blorp \
        libmesa_compiler \
        libmesa_intel_common \
+       libmesa_intel_dev \
        libmesa_vulkan_common \
        libmesa_anv_gen7 \
        libmesa_anv_gen75 \