diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build index 9cc0b1ddfad..dc13b8ea849 100644 --- a/src/gallium/drivers/zink/meson.build +++ b/src/gallium/drivers/zink/meson.build @@ -46,7 +46,7 @@ zink_device_info = custom_target( input : ['zink_device_info.py'], output : ['zink_device_info.h', 'zink_device_info.c'], command : [ - prog_python, '@INPUT@', '@OUTPUT@' + prog_python, '@INPUT@', '@OUTPUT@', join_paths(meson.source_root(), 'src/vulkan/registry/vk.xml') ] ) diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index 5117cc7000e..8bb30d62773 100644 --- a/src/gallium/drivers/zink/zink_device_info.py +++ b/src/gallium/drivers/zink/zink_device_info.py @@ -26,7 +26,7 @@ from mako.template import Template from mako.lookup import TemplateLookup from os import path -from zink_extensions import Extension,Version +from zink_extensions import Extension,ExtensionRegistry,Version import sys # constructor: @@ -390,13 +390,17 @@ if __name__ == "__main__": try: header_path = sys.argv[1] impl_path = sys.argv[2] + vkxml_path = sys.argv[3] header_path = path.abspath(header_path) impl_path = path.abspath(impl_path) + vkxml_path = path.abspath(vkxml_path) except: - print("usage: %s " % sys.argv[0]) + print("usage: %s " % sys.argv[0]) exit(1) + registry = ExtensionRegistry(vkxml_path) + extensions = EXTENSIONS versions = VERSIONS replacement = REPLACEMENTS