[Mesa-dev] [PATCH 02/25] anv: remove unused dev_icd.json

[Jason Ekstrand]

On Thu, Apr 21, 2016 at 8:56 AM, Emil Velikov <emil.l.velikov at gmail.com>
wrote:

> On 21 April 2016 at 15:56, Jason Ekstrand <jason at jlekstrand.net> wrote:
> >
> > On Apr 21, 2016 7:52 AM, "Erik Faye-Lund" <kusmabite at gmail.com> wrote:
> >>
> >> On Thu, Apr 21, 2016 at 3:16 PM, Emil Velikov <emil.l.velikov at gmail.com
> >
> >> wrote:
> >> > From: Emil Velikov <emil.velikov at collabora.com>
> >> >
> >> > Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> >> > ---
> >> >  src/intel/vulkan/.gitignore      | 1 -
> >> >  src/intel/vulkan/Makefile.am     | 1 -
> >> >  src/intel/vulkan/dev_icd.json.in | 7 -------
> >> >  3 files changed, 9 deletions(-)
> >> >  delete mode 100644 src/intel/vulkan/dev_icd.json.in
> >> >
> >> > diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore
> >> > index 4a683b4..f23e957 100644
> >> > --- a/src/intel/vulkan/.gitignore
> >> > +++ b/src/intel/vulkan/.gitignore
> >> > @@ -4,5 +4,4 @@
> >> >  /anv_entrypoints.h
> >> >  /wayland-drm-protocol.c
> >> >  /wayland-drm-client-protocol.h
> >> > -/dev_icd.json
> >> >  /gen*_pack.h
> >> > diff --git a/src/intel/vulkan/Makefile.am
> b/src/intel/vulkan/Makefile.am
> >> > index edbe213..c943970 100644
> >> > --- a/src/intel/vulkan/Makefile.am
> >> > +++ b/src/intel/vulkan/Makefile.am
> >> > @@ -187,7 +187,6 @@ libvulkan_intel_la_LDFLAGS = \
> >> >
> >> >  icdconfdir=$(sysconfdir)/vulkan/icd.d
> >> >  icdconf_DATA = intel_icd.json
> >> > -noinst_DATA = dev_icd.json
> >> >
> >> >  %.json : %.json.in
> >> >         $(AM_V_GEN) $(SED) \
> >> > diff --git a/src/intel/vulkan/dev_icd.json.in
> >> > b/src/intel/vulkan/dev_icd.json.in
> >> > deleted file mode 100644
> >> > index 8492036..0000000
> >> > --- a/src/intel/vulkan/dev_icd.json.in
> >> > +++ /dev/null
> >> > @@ -1,7 +0,0 @@
> >> > -{
> >> > -    "file_format_version": "1.0.0",
> >> > -    "ICD": {
> >> > -        "library_path": "@build_libdir@/libvulkan_intel.so",
> >> > -        "abi_versions": "1.0.3"
> >> > -    }
> >> > -}
> >>
> >> This seems quite useful for developers to make the vulkan-loader load
> >> the driver from the build-tree rather than the installed location...
> >> Do you really need to remove it?
> >
> > Yeah, I use this every day. NAK
> In that case any objections if we s/%/dev_icd/ in the rule and add a
> comment ?
>

That's fine.


> Looks like I've missed the spec hunk which mentions that json from
> $(HOME)/... can be used.
>

You just set VK_ICD_FILENAMES=$HOME/path/to/my/icd.json and it'll grab that
one.


> Thanks for setting me straight guys !
>
> Emil
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160421/dc1b96d3/attachment.html>