[Mesa-dev] [PATCH 1/2] anv: Add a new centralized extensions file

[Lionel Landwerlin]

Both patches are :

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

On 14/07/17 07:14, Jason Ekstrand wrote:
> This will allow us to keep everything in one place when it comes to
> declaring what extensions are supported.
> ---
>   src/intel/Makefile.vulkan.am            |  3 +-
>   src/intel/vulkan/anv_entrypoints_gen.py | 27 +++-----------
>   src/intel/vulkan/anv_extensions.py      | 63 +++++++++++++++++++++++++++++++++
>   3 files changed, 69 insertions(+), 24 deletions(-)
>   create mode 100644 src/intel/vulkan/anv_extensions.py
>
> diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
> index 6550f68..d6e11f8 100644
> --- a/src/intel/Makefile.vulkan.am
> +++ b/src/intel/Makefile.vulkan.am
> @@ -24,7 +24,8 @@
>   # out and we'll fail at `make dist'
>   vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
>   
> -vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py $(vulkan_api_xml)
> +vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
> +			  vulkan/anv_extensions.py $(vulkan_api_xml)
>   	$(MKDIR_GEN)
>   	$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \
>   		--xml $(vulkan_api_xml) --outdir $(builddir)/vulkan
> diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
> index e59c494..0c6e310 100644
> --- a/src/intel/vulkan/anv_entrypoints_gen.py
> +++ b/src/intel/vulkan/anv_entrypoints_gen.py
> @@ -30,29 +30,9 @@ import xml.etree.cElementTree as et
>   
>   from mako.template import Template
>   
> -MAX_API_VERSION = 1.0
> +import anv_extensions
>   
> -SUPPORTED_EXTENSIONS = [
> -    'VK_KHR_dedicated_allocation',
> -    'VK_KHR_descriptor_update_template',
> -    'VK_KHR_external_memory',
> -    'VK_KHR_external_memory_capabilities',
> -    'VK_KHR_external_memory_fd',
> -    'VK_KHR_get_memory_requirements2',
> -    'VK_KHR_get_physical_device_properties2',
> -    'VK_KHR_get_surface_capabilities2',
> -    'VK_KHR_incremental_present',
> -    'VK_KHR_maintenance1',
> -    'VK_KHR_push_descriptor',
> -    'VK_KHR_sampler_mirror_clamp_to_edge',
> -    'VK_KHR_shader_draw_parameters',
> -    'VK_KHR_surface',
> -    'VK_KHR_swapchain',
> -    'VK_KHR_wayland_surface',
> -    'VK_KHR_xcb_surface',
> -    'VK_KHR_xlib_surface',
> -    'VK_KHX_multiview',
> -]
> +MAX_API_VERSION = 1.0
>   
>   # We generate a static hash table for entry point lookup
>   # (vkGetProcAddress). We use a linear congruential generator for our hash
> @@ -288,8 +268,9 @@ def get_entrypoints(doc, entrypoints_to_defines):
>           for command in feature.findall('./require/command'):
>               enabled_commands.add(command.attrib['name'])
>   
> +    supported = set(ext.name for ext in anv_extensions.EXTENSIONS)
>       for extension in doc.findall('.extensions/extension'):
> -        if extension.attrib['name'] not in SUPPORTED_EXTENSIONS:
> +        if extension.attrib['name'] not in supported:
>               continue
>   
>           assert extension.attrib['supported'] == 'vulkan'
> diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
> new file mode 100644
> index 0000000..79d6bb2
> --- /dev/null
> +++ b/src/intel/vulkan/anv_extensions.py
> @@ -0,0 +1,63 @@
> +COPYRIGHT = """\
> +/*
> + * 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 argparse
> +import xml.etree.cElementTree as et
> +
> +from mako.template import Template
> +
> +class Extension:
> +    def __init__(self, name, ext_version, enable):
> +        self.name = name
> +        self.ext_version = int(ext_version)
> +        if enable is True:
> +            self.enable = 'true';
> +        elif enable is False:
> +            self.enable = 'false';
> +        else:
> +            self.enable = enable;
> +
> +EXTENSIONS = [
> +    Extension('VK_KHR_dedicated_allocation',              1, True),
> +    Extension('VK_KHR_descriptor_update_template',        1, True),
> +    Extension('VK_KHR_external_memory',                   1, True),
> +    Extension('VK_KHR_external_memory_capabilities',      1, True),
> +    Extension('VK_KHR_external_memory_fd',                1, True),
> +    Extension('VK_KHR_get_memory_requirements2',          1, True),
> +    Extension('VK_KHR_get_physical_device_properties2',   1, True),
> +    Extension('VK_KHR_get_surface_capabilities2',         1, True),
> +    Extension('VK_KHR_incremental_present',               1, True),
> +    Extension('VK_KHR_maintenance1',                      1, True),
> +    Extension('VK_KHR_push_descriptor',                   1, True),
> +    Extension('VK_KHR_sampler_mirror_clamp_to_edge',      1, True),
> +    Extension('VK_KHR_shader_draw_parameters',            1, True),
> +    Extension('VK_KHR_surface',                          25, True),
> +    Extension('VK_KHR_swapchain',                        68, True),
> +    Extension('VK_KHR_wayland_surface',                   5, 'VK_USE_PLATFORM_WAYLAND_KHR'),
> +    Extension('VK_KHR_xcb_surface',                       6, 'VK_USE_PLATFORM_XCB_KHR'),
> +    Extension('VK_KHR_xlib_surface',                      6, 'VK_USE_PLATFORM_XLIB_KHR'),
> +    Extension('VK_KHX_multiview',                         1, True),
> +]