<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 10, 2018 at 1:11 PM, Andres Gomez <span dir="ltr"><<a href="mailto:agomez@igalia.com" target="_blank">agomez@igalia.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">anv_extensions usage from anv_icd was bringing the unwanted dependency<br>
of mako templates for the latter. We don't want that since it will<br>
force the dependency even for distributable tarballs which was not<br>
needed until now.<br>
<br>
Jason suggested this approach.<br>
<br>
</span>v2: Patch simplification (Jason).<br>
<span class=""><br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=104551" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/<wbr>show_bug.cgi?id=104551</a><br>
Fixes: 0ab04ba979b ("anv: Use python to generate ICD json files")<br>
Cc: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br>
Cc: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
Signed-off-by: Andres Gomez <<a href="mailto:agomez@igalia.com">agomez@igalia.com</a>><br>
---<br>
</span> src/intel/vulkan/anv_<wbr>extensions.py | 10 +++++-----<br>
1 file changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/anv_<wbr>extensions.py b/src/intel/vulkan/anv_<wbr>extensions.py<br>
index 16e5582598e..adfebca985c 100644<br>
<span class="">--- a/src/intel/vulkan/anv_<wbr>extensions.py<br>
+++ b/src/intel/vulkan/anv_<wbr>extensions.py<br>
@@ -29,8 +29,6 @@ import copy<br>
import re<br>
import xml.etree.cElementTree as et<br>
<br>
-from mako.template import Template<br>
-<br>
MAX_API_VERSION = '1.0.57'<br>
<br>
class Extension:<br>
</span>@@ -160,7 +158,7 @@ def _init_exts_from_xml(xml):<br>
<span class=""> ext = ext_name_map[ext_name]<br>
ext.type = ext_elem.attrib['type']<br>
<br>
-_TEMPLATE = Template(COPYRIGHT + """<br>
</span>+_TEMPLATE = COPYRIGHT + """<br>
#include "anv_private.h"<br>
<br>
#include "vk_util.h"<br>
@@ -258,7 +256,7 @@ VkResult anv_<wbr>EnumerateDeviceExtensionProper<wbr>ties(<br>
<br>
return vk_outarray_status(&out);<br>
}<br>
-""")<br>
+"""<br>
<br>
if __name__ == '__main__':<br>
parser = argparse.ArgumentParser()<br>
@@ -282,5 +280,7 @@ if __name__ == '__main__':<br>
<span class=""> 'device_extensions': [e for e in EXTENSIONS if e.type == 'device'],<br>
}<br>
<br>
</span><span class="">+ from mako.template import Template<br>
+<br>
</span><span class=""> with open(args.out, 'w') as f:<br>
</span>- f.write(_TEMPLATE.render(**<wbr>template_env))<br>
+ f.write(Template(_TEMPLATE).<wbr>render(**template_env))<br>
<div class="HOEnZb"><div class="h5">--<br>
2.15.1<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</div></div></blockquote></div><br></div>