diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-08-01 11:31:51 -0700 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-08-02 09:13:13 -0700 |
commit | 0ab04ba979b7eb360176e6abad1d296e9da94985 (patch) | |
tree | f47f673dfcd076c35125cd96e0cbe6a6e68f5a01 /src/intel/Makefile.vulkan.am | |
parent | 7382d8a41684e6f7cd7a558469fcd2724c844982 (diff) |
anv: Use python to generate ICD json files
This is more lines of code but the python is far easier to read than the
sed expressions we were using before. Also, this allows us to pull the
API version from anv_entrypoints.py so it never gets out-of-sync.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Diffstat (limited to 'src/intel/Makefile.vulkan.am')
-rw-r--r-- | src/intel/Makefile.vulkan.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index f91fdc62d42..de5c09fd559 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -50,15 +50,13 @@ EXTRA_DIST += \ vulkan/intel_icd.json.in \ vulkan/TODO -vulkan/dev_icd.json : vulkan/dev_icd.json.in - $(AM_V_GEN) $(SED) \ - -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ - < $(srcdir)/vulkan/dev_icd.json.in > $@ - -vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in - $(AM_V_GEN) $(SED) \ - -e "s#@install_libdir@#${libdir}#" \ - < $(srcdir)/vulkan/intel_icd.json.in > $@ +vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ + --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ + +vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ + --lib-path="${libdir}" --out $@ if HAVE_INTEL_VULKAN |