X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2FMakefile.am;h=18f263ab44746f6fe095246aa5ab6d51af4c7740;hb=ded150958740e47cb7bc4ba868289b88268f666c;hp=190be8d000cecd9c1ba84a336d222534ac7a3042;hpb=0f434a68a39f391795dff92c317349d28dd2e638;p=mesa.git diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index 190be8d000c..18f263ab447 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -21,10 +21,12 @@ include Makefile.sources -vulkan_includedir = $(includedir)/vulkan - -vulkan_include_HEADERS = \ +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 @@ -32,13 +34,12 @@ lib_LTLIBRARIES = libvulkan_radeon.la # The gallium includes are for the util/u_math.h include from main/macros.h AM_CPPFLAGS = \ - $(AMDGPU_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/vulkan/wsi \ + -I$(top_builddir)/src/vulkan/util \ + -I$(top_srcdir)/src/vulkan/util \ -I$(top_srcdir)/src/amd \ -I$(top_srcdir)/src/amd/common \ -I$(top_builddir)/src/compiler \ @@ -48,7 +49,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/include + -I$(top_srcdir)/src/gallium/include \ + $(AMDGPU_CFLAGS) \ + $(VALGRIND_CFLAGS) \ + $(DEFINES) AM_CFLAGS = \ $(VISIBILITY_CFLAGS) \ @@ -59,8 +63,22 @@ VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) -VULKAN_LIB_DEPS = - +VULKAN_LIB_DEPS = \ + libvulkan_common.la \ + $(top_builddir)/src/vulkan/libvulkan_util.la \ + $(top_builddir)/src/vulkan/libvulkan_wsi.la \ + $(top_builddir)/src/amd/common/libamd_common.la \ + $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(LLVM_LIBS) \ + $(LIBELF_LIBS) \ + $(PTHREAD_LIBS) \ + $(AMDGPU_LIBS) \ + $(LIBDRM_LIBS) \ + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) \ + -lm if HAVE_PLATFORM_X11 AM_CPPFLAGS += \ @@ -70,60 +88,51 @@ AM_CPPFLAGS += \ VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES) -# FIXME: Use pkg-config for X11-xcb ldflags. -VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb +VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) endif if HAVE_PLATFORM_WAYLAND AM_CPPFLAGS += \ - -I$(top_builddir)/src/egl/wayland/wayland-drm \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm \ - $(WAYLAND_CFLAGS) \ + $(WAYLAND_CLIENT_CFLAGS) \ -DVK_USE_PLATFORM_WAYLAND_KHR VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) VULKAN_LIB_DEPS += \ - $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \ - $(WAYLAND_LIBS) + $(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) -VULKAN_LIB_DEPS += \ - libvulkan_common.la \ - $(top_builddir)/src/vulkan/wsi/libvulkan_wsi.la \ - $(top_builddir)/src/amd/common/libamd_common.la \ - $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LLVM_LIBS) \ - $(LIBELF_LIBS) \ - $(PTHREAD_LIBS) \ - $(AMDGPU_LIBS) \ - $(LIBDRM_LIBS) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - -lm - nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES) -radv_entrypoints.h : radv_entrypoints_gen.py $(vulkan_include_HEADERS) - $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\ - $(PYTHON2) $(srcdir)/radv_entrypoints_gen.py header > $@ - -radv_entrypoints.c : radv_entrypoints_gen.py $(vulkan_include_HEADERS) - $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\ - $(PYTHON2) $(srcdir)/radv_entrypoints_gen.py code > $@ +vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml -.PHONY: radv_timestamp.h +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) +radv_entrypoints.h: radv_entrypoints.c -radv_timestamp.h: - @echo "Updating radv_timestamp.h" - $(AM_V_GEN) echo "#define RADV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@ +radv_extensions.c: radv_extensions.py \ + $(vulkan_api_xml) + $(MKDIR_GEN) + $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \ + --xml $(vulkan_api_xml) \ + --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 \ @@ -134,12 +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 \ 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) @@ -159,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#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ - < $(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