anv/entrypoints: Parse entrypoints before extensions/features

[mesa.git] / src / intel / Makefile.vulkan.am

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index fa9b6ba7245a605b302d81a5d7aaf32088ac2682..7823b608804690dbd6216c60c4875b2f83605102 100644 (file)
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -23,18 +23,38 @@
 # rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented
 # out and we'll fail at `make dist'
 vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
+vk_android_native_buffer_xml = $(top_srcdir)/src/vulkan/registry/vk_android_native_buffer.xml
 
 vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
-                         vulkan/anv_extensions.py $(vulkan_api_xml)
+                         vulkan/anv_extensions.py \
+                         $(vulkan_api_xml) \
+                         $(vk_android_native_buffer_xml)
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \
-               --xml $(vulkan_api_xml) --outdir $(builddir)/vulkan
+               --xml $(vulkan_api_xml) \
+               --xml $(vk_android_native_buffer_xml) \
+               --outdir $(builddir)/vulkan
 vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
 
-vulkan/anv_extensions.c: vulkan/anv_extensions.py $(vulkan_api_xml)
+vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \
+                        vulkan/anv_extensions.py \
+                        $(vulkan_api_xml) \
+                        $(vk_android_native_buffer_xml)
        $(MKDIR_GEN)
-       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions.py \
-               --xml $(vulkan_api_xml) --out $@
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
+               --xml $(vulkan_api_xml) \
+               --xml $(vk_android_native_buffer_xml) \
+               --out-c $@
+
+vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \
+                        vulkan/anv_extensions.py \
+                        $(vulkan_api_xml) \
+                        $(vk_android_native_buffer_xml)
+       $(MKDIR_GEN)
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
+               --xml $(vulkan_api_xml) \
+               --xml $(vk_android_native_buffer_xml) \
+               --out-h $@
 
 BUILT_SOURCES += $(VULKAN_GENERATED_FILES)
 CLEANFILES += \
@@ -137,6 +157,13 @@ VULKAN_LIB_DEPS = \
        $(DLOPEN_LIBS) \
        -lm
 
+if HAVE_PLATFORM_ANDROID
+VULKAN_CPPFLAGS += $(ANDROID_CPPFLAGS)
+VULKAN_CFLAGS += $(ANDROID_CFLAGS)
+VULKAN_LIB_DEPS += $(ANDROID_LIBS)
+VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
+endif
+
 if HAVE_PLATFORM_X11
 VULKAN_CPPFLAGS += \
        $(XCB_DRI3_CFLAGS) \
@@ -151,12 +178,12 @@ endif
 
 if HAVE_PLATFORM_WAYLAND
 VULKAN_CPPFLAGS += \
-       $(WAYLAND_CFLAGS) \
+       $(WAYLAND_CLIENT_CFLAGS) \
        -DVK_USE_PLATFORM_WAYLAND_KHR
 
 VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
 
-VULKAN_LIB_DEPS += $(WAYLAND_LIBS)
+VULKAN_LIB_DEPS += $(WAYLAND_CLIENT_LIBS)
 endif
 
 noinst_LTLIBRARIES += vulkan/libvulkan_common.la