From 0f434a68a39f391795dff92c317349d28dd2e638 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 9 Nov 2016 18:11:27 +0000 Subject: [PATCH] radv: Suffix the radeon_icd file with the host CPU MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Port of the anv commit d96345de989 ("anv: Suffix the intel_icd file with the host CPU"). v2: s/intel_icd/radeon_icd/ in commit summary (Gražvydas) Cc: "13.0" Signed-off-by: Emil Velikov Reviewed-by: Dave Airlie (IRC) --- src/amd/vulkan/.gitignore | 1 + src/amd/vulkan/Makefile.am | 9 +++++++-- src/amd/vulkan/{radeon_icd.json => radeon_icd.json.in} | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) rename src/amd/vulkan/{radeon_icd.json => radeon_icd.json.in} (58%) diff --git a/src/amd/vulkan/.gitignore b/src/amd/vulkan/.gitignore index e55e353d8fb..2a42d7fda8e 100644 --- a/src/amd/vulkan/.gitignore +++ b/src/amd/vulkan/.gitignore @@ -4,3 +4,4 @@ /radv_timestamp.h /dev_icd.json /vk_format_table.c +/radeon_icd.*.json diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index 44d2a6660bc..190be8d000c 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -131,7 +131,7 @@ vk_format_table.c: vk_format_table.py \ $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) dev_icd.json radv_timestamp.h +CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json EXTRA_DIST = \ $(top_srcdir)/include/vulkan/vk_icd.h \ dev_icd.json.in \ @@ -155,7 +155,7 @@ libvulkan_radeon_la_LDFLAGS = \ icdconfdir = @VULKAN_ICD_INSTALL_DIR@ -icdconf_DATA = radeon_icd.json +icdconf_DATA = radeon_icd.@host_cpu@.json # The following is used for development purposes, by setting VK_ICD_FILENAMES. noinst_DATA = dev_icd.json @@ -164,4 +164,9 @@ dev_icd.json : dev_icd.json.in -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ < $(srcdir)/dev_icd.json.in > $@ +radeon_icd.@host_cpu@.json : radeon_icd.json.in + $(AM_V_GEN) $(SED) \ + -e "s#@install_libdir@#${libdir}#" \ + < $(srcdir)/radeon_icd.json.in > $@ + include $(top_srcdir)/install-lib-links.mk diff --git a/src/amd/vulkan/radeon_icd.json b/src/amd/vulkan/radeon_icd.json.in similarity index 58% rename from src/amd/vulkan/radeon_icd.json rename to src/amd/vulkan/radeon_icd.json.in index cbb4aabf365..a8b441d672f 100644 --- a/src/amd/vulkan/radeon_icd.json +++ b/src/amd/vulkan/radeon_icd.json.in @@ -1,7 +1,7 @@ { "file_format_version": "1.0.0", "ICD": { - "library_path": "libvulkan_radeon.so", + "library_path": "@install_libdir@/libvulkan_radeon.so", "api_version": "1.0.3" } } -- 2.30.2