diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-11-09 18:11:27 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-11-10 22:07:29 +0000 |
| commit | 3bb0415ab96f74183f7aa58c1a543448653ccb3e (patch) | |
| tree | 40d0df711e8df41c0f685e052e1875c9b9126982 | |
| parent | a4bc03fdfe998fd09aaefef4964bf9359c4c5399 (diff) | |
| download | external_mesa3d-3bb0415ab96f74183f7aa58c1a543448653ccb3e.zip external_mesa3d-3bb0415ab96f74183f7aa58c1a543448653ccb3e.tar.gz external_mesa3d-3bb0415ab96f74183f7aa58c1a543448653ccb3e.tar.bz2 | |
radv: Suffix the radeon_icd file with the host CPU
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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com> (IRC)
(cherry picked from commit 0f434a68a39f391795dff92c317349d28dd2e638)
Squashed with commit:
radv: automake: list correct file in the EXTRA_DIST
Earlier commit renamed the file radeon_icd.json{,.in} but missed one
reference of the file - in EXTRA_DIST.
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Fixes: 0f434a68a ("radv: Suffix the radeon_icd file with the host CPU")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit b359f62456211c2162109064cb504ad7de2ee799)
| -rw-r--r-- | src/amd/vulkan/.gitignore | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/Makefile.am | 11 | ||||
| -rw-r--r-- | src/amd/vulkan/radeon_icd.json.in (renamed from src/amd/vulkan/radeon_icd.json) | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/amd/vulkan/.gitignore b/src/amd/vulkan/.gitignore index e55e353..2a42d7f 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 44d2a66..c559a95 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -131,11 +131,11 @@ 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 \ - radeon_icd.json \ + radeon_icd.json.in \ radv_entrypoints_gen.py \ vk_format_layout.csv \ vk_format_parse.py \ @@ -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 index cbb4aab..a8b441d 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" } } |