diff options
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/anv_extensions_gen.py | 17 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 12 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/intel/vulkan/anv_extensions_gen.py b/src/intel/vulkan/anv_extensions_gen.py index 9bcb631b124..57a528563ed 100644 --- a/src/intel/vulkan/anv_extensions_gen.py +++ b/src/intel/vulkan/anv_extensions_gen.py @@ -45,18 +45,13 @@ def _init_exts_from_xml(xml): if ext_name not in ext_name_map: continue - # Workaround for VK_ANDROID_native_buffer. Its <extension> element in - # vk.xml lists it as supported="disabled" and provides only a stub - # definition. Its <extension> element in Mesa's custom - # vk_android_native_buffer.xml, though, lists it as - # supported='android-vendor' and fully defines the extension. We want - # to skip the <extension> element in vk.xml. - if ext_elem.attrib['supported'] == 'disabled': - assert ext_name == 'VK_ANDROID_native_buffer' - continue - ext = ext_name_map[ext_name] - ext.type = ext_elem.attrib['type'] + if ext_name == 'VK_ANDROID_native_buffer': + # VK_ANDROID_native_buffer is missing the type specifier. Just + # hard-code it to be a device extension for now. + ext.type = 'device' + else: + ext.type = ext_elem.attrib['type'] _TEMPLATE_H = Template(COPYRIGHT + """ diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index ef50134636e..2dce0a1515b 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -22,10 +22,10 @@ anv_extensions_py = files('anv_extensions.py') anv_entrypoints = custom_target( 'anv_entrypoints.[ch]', - input : ['anv_entrypoints_gen.py', vk_api_xml, vk_android_native_buffer_xml], + input : ['anv_entrypoints_gen.py', vk_api_xml], output : ['anv_entrypoints.h', 'anv_entrypoints.c'], command : [ - prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@', + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir', meson.current_build_dir(), ], depend_files : anv_extensions_py, @@ -33,10 +33,10 @@ anv_entrypoints = custom_target( anv_extensions_c = custom_target( 'anv_extensions.c', - input : ['anv_extensions_gen.py', vk_api_xml, vk_android_native_buffer_xml], + input : ['anv_extensions_gen.py', vk_api_xml], output : 'anv_extensions.c', command : [ - prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@', + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT@', ], depend_files : anv_extensions_py, @@ -44,10 +44,10 @@ anv_extensions_c = custom_target( anv_extensions_h = custom_target( 'anv_extensions.h', - input : ['anv_extensions_gen.py', vk_api_xml, vk_android_native_buffer_xml], + input : ['anv_extensions_gen.py', vk_api_xml], output : 'anv_extensions.h', command : [ - prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@', + prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out-h', '@OUTPUT@', ], depend_files : anv_extensions_py, |