diff options
| author | Andres Gomez <[email protected]> | 2018-01-10 23:11:51 +0200 |
|---|---|---|
| committer | Andres Gomez <[email protected]> | 2018-01-11 14:44:03 +0200 |
| commit | a1901d092c053485cdfff0a65a83f9f0987ffc62 (patch) | |
| tree | c145315f95aa749e8c5dc8778825874a06e77438 | |
| parent | f2c0e47d9cf3fa86cdf746beb862164bf0056e20 (diff) | |
anv: Import mako templates only during execution of anv_extensions
anv_extensions usage from anv_icd was bringing the unwanted dependency
of mako templates for the latter. We don't want that since it will
force the dependency even for distributable tarballs which was not
needed until now.
Jason suggested this approach.
v2: Patch simplification (Jason).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104551
Fixes: 0ab04ba979b ("anv: Use python to generate ICD json files")
Cc: Jason Ekstrand <[email protected]>
Cc: Emil Velikov <[email protected]>
Signed-off-by: Andres Gomez <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/intel/vulkan/anv_extensions.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index 16e5582598e..adfebca985c 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -29,8 +29,6 @@ import copy import re import xml.etree.cElementTree as et -from mako.template import Template - MAX_API_VERSION = '1.0.57' class Extension: @@ -160,7 +158,7 @@ def _init_exts_from_xml(xml): ext = ext_name_map[ext_name] ext.type = ext_elem.attrib['type'] -_TEMPLATE = Template(COPYRIGHT + """ +_TEMPLATE = COPYRIGHT + """ #include "anv_private.h" #include "vk_util.h" @@ -258,7 +256,7 @@ VkResult anv_EnumerateDeviceExtensionProperties( return vk_outarray_status(&out); } -""") +""" if __name__ == '__main__': parser = argparse.ArgumentParser() @@ -282,5 +280,7 @@ if __name__ == '__main__': 'device_extensions': [e for e in EXTENSIONS if e.type == 'device'], } + from mako.template import Template + with open(args.out, 'w') as f: - f.write(_TEMPLATE.render(**template_env)) + f.write(Template(_TEMPLATE).render(**template_env)) |