radv: call nir_split_var_copies() before nir_lower_var_copies()

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

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 6b352aebf989bb74abc411e8bbd0a9dba0c013c4..18f263ab44746f6fe095246aa5ab6d51af4c7740 100644 (file)
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -23,6 +23,10 @@ include Makefile.sources
 
 noinst_HEADERS = \
        $(top_srcdir)/include/vulkan/vk_platform.h \
+       $(top_srcdir)/include/vulkan/vulkan_core.h \
+       $(top_srcdir)/include/vulkan/vulkan_wayland.h \
+       $(top_srcdir)/include/vulkan/vulkan_xcb.h \
+       $(top_srcdir)/include/vulkan/vulkan_xlib.h \
        $(top_srcdir)/include/vulkan/vulkan.h
 
 lib_LTLIBRARIES = libvulkan_radeon.la
@@ -99,6 +103,13 @@ VULKAN_LIB_DEPS += \
        $(WAYLAND_CLIENT_LIBS)
 endif
 
+if HAVE_PLATFORM_ANDROID
+AM_CPPFLAGS += $(ANDROID_CPPFLAGS)
+AM_CFLAGS += $(ANDROID_CFLAGS)
+VULKAN_LIB_DEPS += $(ANDROID_LIBS)
+VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
+endif
+
 noinst_LTLIBRARIES = libvulkan_common.la
 libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 
@@ -110,7 +121,8 @@ vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
 radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_entrypoints_gen.py \
-               --xml $(vulkan_api_xml) --outdir $(builddir)
+               --xml $(vulkan_api_xml) \
+               --outdir $(builddir)
 radv_entrypoints.h: radv_entrypoints.c
 
 radv_extensions.c: radv_extensions.py \
@@ -118,7 +130,9 @@ radv_extensions.c: radv_extensions.py \
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \
                --xml $(vulkan_api_xml) \
-               --out $@
+               --out-c radv_extensions.c \
+               --out-h radv_extensions.h
+radv_extensions.h: radv_extensions.c
 
 vk_format_table.c: vk_format_table.py \
                   vk_format_parse.py \
@@ -129,13 +143,13 @@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json
 EXTRA_DIST = \
        $(top_srcdir)/include/vulkan/vk_icd.h \
-       dev_icd.json.in \
-       radeon_icd.json.in \
        radv_entrypoints_gen.py \
        radv_extensions.py \
+       radv_icd.py \
        vk_format_layout.csv \
        vk_format_parse.py \
-       vk_format_table.py
+       vk_format_table.py \
+       meson.build
 
 libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
 
@@ -155,14 +169,12 @@ icdconf_DATA = radeon_icd.@host_cpu@.json
 # The following is used for development purposes, by setting VK_ICD_FILENAMES.
 noinst_DATA = dev_icd.json
 
-dev_icd.json : dev_icd.json.in
-       $(AM_V_GEN) $(SED) \
-               -e "s#@libvulkan_radeon_path@#${abs_top_builddir}/${LIB_DIR}/libvulkan_radeon.so#" \
-               < $(srcdir)/dev_icd.json.in > $@
+dev_icd.json : radv_extensions.py radv_icd.py
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
+               --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
 
-radeon_icd.@host_cpu@.json : radeon_icd.json.in
-       $(AM_V_GEN) $(SED) \
-               -e "s#@install_libdir@#${libdir}#" \
-               < $(srcdir)/radeon_icd.json.in > $@
+radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py
+       $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
+               --lib-path="${libdir}" --out $@
 
 include $(top_srcdir)/install-lib-links.mk