Thanks for doing this! On Wed, Nov 9, 2016 at 10:11 AM, Emil Velikov <[email protected]> wrote:
> From: Emil Velikov <[email protected]> > > Port of the anv commit d96345de989 ("anv: Suffix the intel_icd file with > the host CPU"). > > Cc: "13.0" <[email protected]> > Cc: Dave Airlie <[email protected]> > Signed-off-by: Emil Velikov <[email protected]> > --- > 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 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.@[email protected] > 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.@[email protected] > # 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.@[email protected] : 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 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" > } > } > -- > 2.10.2 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
