<div dir="ltr">Thanks for doing this! </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Nov 9, 2016 at 10:11 AM, Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>> Port of the anv commit d96345de989 ("anv: Suffix the intel_icd file with the host CPU"). Cc: "13.0" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a>> Cc: Dave Airlie <<a href="mailto:airlied@redhat.com">airlied@redhat.com</a>> Signed-off-by: Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>> --- src/amd/vulkan/.gitignore | 1 + src/amd/vulkan/Makefile.am | 9 +++++++-- src/amd/vulkan/{radeon_icd.json => <a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a>} | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) rename src/amd/vulkan/{radeon_icd.json => <a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a>} (58%) 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..190be8d 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 \ <a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a> \ @@ -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 : <a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a> -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ < $(srcdir)/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a> > $@ +radeon_icd.@host_cpu@.json : <a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a> + $(AM_V_GEN) $(SED) \ + -e "s#@install_libdir@#${libdir}#" \ + < $(srcdir)/<a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a> > $@ + include $(top_srcdir)/<a href="http://install-lib-links.mk" rel="noreferrer" target="_blank">install-lib-links.mk</a> diff --git a/src/amd/vulkan/radeon_icd.json b/src/amd/vulkan/<a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a> similarity index 58% rename from src/amd/vulkan/radeon_icd.json rename to src/amd/vulkan/<a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a> index cbb4aab..a8b441d 100644 --- a/src/amd/vulkan/radeon_icd.json +++ b/src/amd/vulkan/<a href="http://radeon_icd.json.in" rel="noreferrer" target="_blank">radeon_icd.json.in</a> @@ -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.10.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>