configure: allow building with python3

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

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index a4e23cd28e0efd38f278aefc96b1e387082d9d68..2522171dacfae338a5559f671572dedcfe158afa 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
@@ -55,6 +59,10 @@ AM_CFLAGS = \
        $(PTHREAD_CFLAGS) \
        $(LLVM_CFLAGS)
 
+AM_CXXFLAGS = \
+       $(VISIBILITY_CXXFLAGS) \
+       $(LLVM_CXXFLAGS)
+
 VULKAN_SOURCES = \
        $(VULKAN_GENERATED_FILES) \
        $(VULKAN_FILES)
@@ -76,6 +84,22 @@ VULKAN_LIB_DEPS = \
        $(DLOPEN_LIBS) \
        -lm
 
+if HAVE_PLATFORM_DRM
+AM_CPPFLAGS += \
+       -DVK_USE_PLATFORM_DISPLAY_KHR
+
+VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
+endif
+
+if HAVE_XLIB_LEASE
+AM_CPPFLAGS += \
+       -DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+       $(XCB_RANDR_CFLAGS) \
+       $(XLIB_RANDR_CFLAGS)
+
+VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
+endif
+
 if HAVE_PLATFORM_X11
 AM_CPPFLAGS += \
        $(XCB_DRI3_CFLAGS) \
@@ -100,7 +124,7 @@ VULKAN_LIB_DEPS += \
 endif
 
 if HAVE_PLATFORM_ANDROID
-AM_CPPFLAGS += $(ANDROID_CPPFLAGS)
+AM_CPPFLAGS += $(ANDROID_CPPFLAGS) -DVK_USE_PLATFORM_ANDROID_KHR
 AM_CFLAGS += $(ANDROID_CFLAGS)
 VULKAN_LIB_DEPS += $(ANDROID_LIBS)
 VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
@@ -113,40 +137,39 @@ nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp
 libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES)
 
 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
 
 radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
        $(MKDIR_GEN)
-       $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_entrypoints_gen.py \
+       $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \
                --xml $(vulkan_api_xml) \
-               --xml $(vk_android_native_buffer_xml) \
                --outdir $(builddir)
 radv_entrypoints.h: radv_entrypoints.c
 
 radv_extensions.c: radv_extensions.py \
                 $(vulkan_api_xml)
        $(MKDIR_GEN)
-       $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \
+       $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \
                --xml $(vulkan_api_xml) \
-               --xml $(vk_android_native_buffer_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 \
                    vk_format_layout.csv
-       $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
+       $(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
 
 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)
 
@@ -166,14 +189,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)$(PYTHON) $(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)$(PYTHON) $(srcdir)/radv_icd.py \
+               --lib-path="${libdir}" --out $@
 
 include $(top_srcdir)/install-lib-links.mk