diff options
| -rw-r--r-- | src/intel/Makefile.vulkan.am | 16 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_icd.py | 47 | ||||
| -rw-r--r-- | src/intel/vulkan/dev_icd.json.in | 7 | ||||
| -rw-r--r-- | src/intel/vulkan/intel_icd.json.in | 7 |
4 files changed, 54 insertions, 23 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.@[email protected] : 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.@[email protected] : 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 diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py new file mode 100644 index 00000000000..4ed01fa2330 --- /dev/null +++ b/src/intel/vulkan/anv_icd.py @@ -0,0 +1,47 @@ +# Copyright 2017 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sub license, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice (including the +# next paragraph) shall be included in all copies or substantial portions +# of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +# IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import json +import os.path + +from anv_extensions import * + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('--out', help='Output jsono file.', required=True) + parser.add_argument('--lib-path', help='Path to libvulkan_intel.so') + args = parser.parse_args() + + path = 'libvulkan_intel.so' + if args.lib_path: + path = os.path.join(args.lib_path, path) + + json_data = { + 'file_format_version': '1.0.0', + 'ICD': { + 'library_path': path, + 'api_version': str(MAX_API_VERSION), + }, + } + + with open(args.out, 'w') as f: + json.dump(json_data, f, indent = 4) diff --git a/src/intel/vulkan/dev_icd.json.in b/src/intel/vulkan/dev_icd.json.in deleted file mode 100644 index 84ac3d44b3d..00000000000 --- 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", - "api_version": "1.0.54" - } -} diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in deleted file mode 100644 index 61db4bfb6ed..00000000000 --- a/src/intel/vulkan/intel_icd.json.in +++ /dev/null @@ -1,7 +0,0 @@ -{ - "file_format_version": "1.0.0", - "ICD": { - "library_path": "@install_libdir@/libvulkan_intel.so", - "api_version": "1.0.54" - } -} |