<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 21, 2016 at 8:56 AM, Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 21 April 2016 at 15:56, Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> wrote:<br>
><br>
> On Apr 21, 2016 7:52 AM, "Erik Faye-Lund" <<a href="mailto:kusmabite@gmail.com">kusmabite@gmail.com</a>> wrote:<br>
>><br>
>> On Thu, Apr 21, 2016 at 3:16 PM, Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>><br>
>> wrote:<br>
>> > From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
>> ><br>
>> > Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
>> > ---<br>
>> > src/intel/vulkan/.gitignore | 1 -<br>
>> > src/intel/vulkan/Makefile.am | 1 -<br>
>> > src/intel/vulkan/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a> | 7 -------<br>
>> > 3 files changed, 9 deletions(-)<br>
>> > delete mode 100644 src/intel/vulkan/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a><br>
>> ><br>
>> > diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore<br>
>> > index 4a683b4..f23e957 100644<br>
>> > --- a/src/intel/vulkan/.gitignore<br>
>> > +++ b/src/intel/vulkan/.gitignore<br>
>> > @@ -4,5 +4,4 @@<br>
>> > /anv_entrypoints.h<br>
>> > /wayland-drm-protocol.c<br>
>> > /wayland-drm-client-protocol.h<br>
>> > -/dev_icd.json<br>
>> > /gen*_pack.h<br>
>> > diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am<br>
>> > index edbe213..c943970 100644<br>
>> > --- a/src/intel/vulkan/Makefile.am<br>
>> > +++ b/src/intel/vulkan/Makefile.am<br>
>> > @@ -187,7 +187,6 @@ libvulkan_intel_la_LDFLAGS = \<br>
>> ><br>
>> > icdconfdir=$(sysconfdir)/vulkan/icd.d<br>
>> > icdconf_DATA = intel_icd.json<br>
>> > -noinst_DATA = dev_icd.json<br>
>> ><br>
>> > %.json : %.<a href="http://json.in" rel="noreferrer" target="_blank">json.in</a><br>
>> > $(AM_V_GEN) $(SED) \<br>
>> > diff --git a/src/intel/vulkan/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a><br>
>> > b/src/intel/vulkan/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a><br>
>> > deleted file mode 100644<br>
>> > index 8492036..0000000<br>
>> > --- a/src/intel/vulkan/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a><br>
>> > +++ /dev/null<br>
>> > @@ -1,7 +0,0 @@<br>
>> > -{<br>
>> > - "file_format_version": "1.0.0",<br>
>> > - "ICD": {<br>
>> > - "library_path": "@build_libdir@/libvulkan_intel.so",<br>
>> > - "abi_versions": "1.0.3"<br>
>> > - }<br>
>> > -}<br>
>><br>
>> This seems quite useful for developers to make the vulkan-loader load<br>
>> the driver from the build-tree rather than the installed location...<br>
>> Do you really need to remove it?<br>
><br>
> Yeah, I use this every day. NAK<br>
</div></div>In that case any objections if we s/%/dev_icd/ in the rule and add a comment ?<br></blockquote><div><br></div><div>That's fine.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Looks like I've missed the spec hunk which mentions that json from<br>
$(HOME)/... can be used.<br></blockquote><div><br></div><div>You just set VK_ICD_FILENAMES=$HOME/path/to/my/icd.json and it'll grab that one.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Thanks for setting me straight guys !<br>
<span class="HOEnZb"><font color="#888888"><br>
Emil<br>
</font></span></blockquote></div><br></div></div>