configure.ac: split the wayland client/server confusion

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

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 878abf3f7d3151ccf6176f83290f8bffd7978a6c..271b0a5079b2d7af5907dd19c5d413fb11be7f0e 100644 (file)
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -23,13 +23,28 @@
 # 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_api_xml)
+vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
+                         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) \
+                        $(vk_android_native_buffer_xml)
+       $(MKDIR_GEN)
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions.py \
+               --xml $(vulkan_api_xml) \
+               --xml $(vk_android_native_buffer_xml) \
+               --out $@
+
 BUILT_SOURCES += $(VULKAN_GENERATED_FILES)
 CLEANFILES += \
        $(VULKAN_GENERATED_FILES) \
@@ -39,19 +54,17 @@ CLEANFILES += \
 EXTRA_DIST += \
        $(top_srcdir)/include/vulkan/vk_icd.h \
        vulkan/anv_entrypoints_gen.py \
-       vulkan/dev_icd.json.in \
-       vulkan/intel_icd.json.in \
+       vulkan/anv_extensions.py \
+       vulkan/anv_icd.py \
        vulkan/TODO
 
-vulkan/dev_icd.json : vulkan/dev_icd.json.in
-       $(AM_V_GEN) $(SED) \
-               -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
-               < $(srcdir)/vulkan/dev_icd.json.in > $@
+vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
+               --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
 
-vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in
-       $(AM_V_GEN) $(SED) \
-               -e "s#@install_libdir@#${libdir}#" \
-               < $(srcdir)/vulkan/intel_icd.json.in > $@
+vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
+               --lib-path="${libdir}" --out $@
 
 if HAVE_INTEL_VULKAN
 
@@ -72,7 +85,8 @@ VULKAN_PER_GEN_LIBS = \
        vulkan/libanv-gen7.la \
        vulkan/libanv-gen75.la \
        vulkan/libanv-gen8.la \
-       vulkan/libanv-gen9.la
+       vulkan/libanv-gen9.la \
+       vulkan/libanv-gen10.la
 
 noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS)
 
@@ -83,6 +97,7 @@ VULKAN_CFLAGS = \
 VULKAN_CPPFLAGS = \
        -I$(top_srcdir)/src/compiler \
        -I$(top_srcdir)/src/intel/compiler \
+       -I$(top_srcdir)/include/drm-uapi \
        -I$(top_builddir)/src/intel/vulkan \
        -I$(top_srcdir)/src/intel/vulkan \
        -I$(top_srcdir)/src/vulkan/wsi \
@@ -107,6 +122,10 @@ vulkan_libanv_gen9_la_CFLAGS = $(VULKAN_CFLAGS)
 vulkan_libanv_gen9_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=90
 vulkan_libanv_gen9_la_SOURCES = $(VULKAN_GEN9_FILES)
 
+vulkan_libanv_gen10_la_CFLAGS = $(VULKAN_CFLAGS)
+vulkan_libanv_gen10_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=100
+vulkan_libanv_gen10_la_SOURCES = $(VULKAN_GEN10_FILES)
+
 VULKAN_SOURCES = \
        $(VULKAN_GENERATED_FILES) \
        $(VULKAN_FILES)
@@ -141,12 +160,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