"""
import argparse
-import copy
+import os.path
import re
-import xml.etree.cElementTree as et
+import sys
-from mako.template import Template
+VULKAN_UTIL = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../vulkan/util'))
+sys.path.append(VULKAN_UTIL)
-MAX_API_VERSION = '1.1.107'
+from vk_extensions import *
+from vk_extensions_gen import *
-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;
+MAX_API_VERSION = '1.2.128'
+
+# Supported API versions. Each one is the maximum patch version for the given
+# version. Version come in increasing order and each version is available if
+# it's provided "enable" condition is true and all previous versions are
+# available.
+# TODO: The patch version should be unified!
+API_VERSIONS = [
+ ApiVersion('1.0.68', True),
+ ApiVersion('1.1.107', True),
+ ApiVersion('1.2.131', '!ANDROID'),
+]
+
+MAX_API_VERSION = None # Computed later
# On Android, we disable all surface and swapchain extensions. Android's Vulkan
# loader implements VK_KHR_surface and VK_KHR_swapchain, and applications
EXTENSIONS = [
Extension('VK_ANDROID_external_memory_android_hardware_buffer', 3, 'RADV_SUPPORT_ANDROID_HARDWARE_BUFFER && device->rad_info.has_syncobj_wait_for_submit'),
Extension('VK_ANDROID_native_buffer', 5, 'ANDROID && device->rad_info.has_syncobj_wait_for_submit'),
- Extension('VK_KHR_16bit_storage', 1, '!device->use_aco'),
+ Extension('VK_KHR_16bit_storage', 1, True),
Extension('VK_KHR_bind_memory2', 1, True),
Extension('VK_KHR_buffer_device_address', 1, True),
Extension('VK_KHR_create_renderpass2', 1, True),
Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True),
Extension('VK_KHR_sampler_ycbcr_conversion', 1, True),
Extension('VK_KHR_separate_depth_stencil_layouts', 1, True),
- Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9'),
+ Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9 || !device->use_llvm'),
Extension('VK_KHR_shader_clock', 1, True),
Extension('VK_KHR_shader_draw_parameters', 1, True),
Extension('VK_KHR_shader_float_controls', 1, True),
- Extension('VK_KHR_shader_float16_int8', 1, '!device->use_aco'),
+ Extension('VK_KHR_shader_float16_int8', 1, True),
+ Extension('VK_KHR_shader_non_semantic_info', 1, True),
Extension('VK_KHR_shader_subgroup_extended_types', 1, True),
Extension('VK_KHR_spirv_1_4', 1, True),
Extension('VK_KHR_storage_buffer_storage_class', 1, True),
Extension('VK_KHR_surface', 25, 'RADV_HAS_SURFACE'),
Extension('VK_KHR_surface_protected_capabilities', 1, 'RADV_HAS_SURFACE'),
Extension('VK_KHR_swapchain', 68, 'RADV_HAS_SURFACE'),
+ Extension('VK_KHR_swapchain_mutable_format', 1, 'RADV_HAS_SURFACE'),
Extension('VK_KHR_timeline_semaphore', 2, 'device->rad_info.has_syncobj_wait_for_submit'),
Extension('VK_KHR_uniform_buffer_standard_layout', 1, True),
Extension('VK_KHR_variable_pointers', 1, True),
Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
Extension('VK_KHR_multiview', 1, True),
Extension('VK_KHR_display', 23, 'VK_USE_PLATFORM_DISPLAY_KHR'),
- Extension('VK_KHR_8bit_storage', 1, 'device->rad_info.chip_class >= GFX8 && !device->use_aco'),
+ Extension('VK_KHR_8bit_storage', 1, True),
Extension('VK_EXT_direct_mode_display', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'),
Extension('VK_EXT_acquire_xlib_display', 1, 'VK_USE_PLATFORM_XLIB_XRANDR_EXT'),
Extension('VK_EXT_buffer_device_address', 1, True),
Extension('VK_EXT_calibrated_timestamps', 1, True),
Extension('VK_EXT_conditional_rendering', 1, True),
Extension('VK_EXT_conservative_rasterization', 1, 'device->rad_info.chip_class >= GFX9'),
+ Extension('VK_EXT_custom_border_color', 12, True),
Extension('VK_EXT_display_surface_counter', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'),
Extension('VK_EXT_display_control', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'),
Extension('VK_EXT_debug_report', 9, True),
Extension('VK_EXT_depth_range_unrestricted', 1, True),
Extension('VK_EXT_descriptor_indexing', 2, True),
Extension('VK_EXT_discard_rectangles', 1, True),
+ Extension('VK_EXT_extended_dynamic_state', 1, True),
Extension('VK_EXT_external_memory_dma_buf', 1, True),
Extension('VK_EXT_external_memory_host', 1, 'device->rad_info.has_userptr'),
Extension('VK_EXT_global_priority', 1, 'device->rad_info.has_ctx_priority'),
Extension('VK_EXT_host_query_reset', 1, True),
+ Extension('VK_EXT_image_robustness', 1, True),
Extension('VK_EXT_index_type_uint8', 1, 'device->rad_info.chip_class >= GFX8'),
Extension('VK_EXT_inline_uniform_block', 1, True),
+ # Disable line rasterization on GFX9 until the CTS failures have been resolved.
+ Extension('VK_EXT_line_rasterization', 1, 'device->rad_info.chip_class != GFX9'),
Extension('VK_EXT_memory_budget', 1, True),
Extension('VK_EXT_memory_priority', 1, True),
Extension('VK_EXT_pci_bus_info', 2, True),
+ Extension('VK_EXT_pipeline_creation_cache_control', 3, True),
Extension('VK_EXT_pipeline_creation_feedback', 1, True),
Extension('VK_EXT_post_depth_coverage', 1, 'device->rad_info.chip_class >= GFX10'),
+ Extension('VK_EXT_private_data', 1, True),
Extension('VK_EXT_queue_family_foreign', 1, True),
- Extension('VK_EXT_sample_locations', 1, True),
- Extension('VK_EXT_sampler_filter_minmax', 1, 'device->rad_info.chip_class >= GFX7'),
+ Extension('VK_EXT_robustness2', 1, True),
+ # Disable sample locations on GFX10 until the CTS failures have been resolved.
+ Extension('VK_EXT_sample_locations', 1, 'device->rad_info.chip_class < GFX10'),
+ Extension('VK_EXT_sampler_filter_minmax', 1, True),
Extension('VK_EXT_scalar_block_layout', 1, 'device->rad_info.chip_class >= GFX7'),
- Extension('VK_EXT_shader_demote_to_helper_invocation',1, 'device->use_aco'),
+ Extension('VK_EXT_shader_demote_to_helper_invocation',1, 'LLVM_VERSION_MAJOR >= 9 || !device->use_llvm'),
Extension('VK_EXT_shader_viewport_index_layer', 1, True),
Extension('VK_EXT_shader_stencil_export', 1, True),
Extension('VK_EXT_shader_subgroup_ballot', 1, True),
Extension('VK_EXT_shader_subgroup_vote', 1, True),
- Extension('VK_EXT_subgroup_size_control', 2, '!device->use_aco'),
+ Extension('VK_EXT_subgroup_size_control', 2, True),
Extension('VK_EXT_texel_buffer_alignment', 1, True),
Extension('VK_EXT_transform_feedback', 1, True),
Extension('VK_EXT_vertex_attribute_divisor', 3, True),
Extension('VK_AMD_device_coherent_memory', 1, True),
Extension('VK_AMD_draw_indirect_count', 1, True),
Extension('VK_AMD_gcn_shader', 1, True),
- Extension('VK_AMD_gpu_shader_half_float', 1, '!device->use_aco && device->rad_info.chip_class >= GFX9'),
- Extension('VK_AMD_gpu_shader_int16', 1, '!device->use_aco && device->rad_info.chip_class >= GFX9'),
+ Extension('VK_AMD_gpu_shader_half_float', 1, 'device->rad_info.has_packed_math_16bit'),
+ Extension('VK_AMD_gpu_shader_int16', 1, 'device->rad_info.has_packed_math_16bit'),
+ Extension('VK_AMD_memory_overallocation_behavior', 1, True),
+ # Disable mixed attachment samples on GFX6-GFX7 until the CTS failures have been resolved.
+ Extension('VK_AMD_mixed_attachment_samples', 1, 'device->rad_info.chip_class >= GFX8'),
Extension('VK_AMD_rasterization_order', 1, 'device->rad_info.has_out_of_order_rast'),
- Extension('VK_AMD_shader_ballot', 1, 'device->use_shader_ballot'),
+ Extension('VK_AMD_shader_ballot', 1, True),
Extension('VK_AMD_shader_core_properties', 1, True),
Extension('VK_AMD_shader_core_properties2', 1, True),
+ Extension('VK_AMD_shader_explicit_vertex_parameter', 1, True),
+ Extension('VK_AMD_shader_image_load_store_lod', 1, True),
+ Extension('VK_AMD_shader_fragment_mask', 1, True),
Extension('VK_AMD_shader_info', 1, True),
Extension('VK_AMD_shader_trinary_minmax', 1, True),
+ Extension('VK_AMD_texture_gather_bias_lod', 1, True),
Extension('VK_GOOGLE_decorate_string', 1, True),
Extension('VK_GOOGLE_hlsl_functionality1', 1, True),
- Extension('VK_NV_compute_shader_derivatives', 1, 'device->rad_info.chip_class >= GFX8'),
+ Extension('VK_GOOGLE_user_type', 1, True),
+ Extension('VK_NV_compute_shader_derivatives', 1, True),
]
-class VkVersion:
- def __init__(self, string):
- split = string.split('.')
- self.major = int(split[0])
- self.minor = int(split[1])
- if len(split) > 2:
- assert len(split) == 3
- self.patch = int(split[2])
- else:
- self.patch = None
-
- # Sanity check. The range bits are required by the definition of the
- # VK_MAKE_VERSION macro
- assert self.major < 1024 and self.minor < 1024
- assert self.patch is None or self.patch < 4096
- assert(str(self) == string)
-
- def __str__(self):
- ver_list = [str(self.major), str(self.minor)]
- if self.patch is not None:
- ver_list.append(str(self.patch))
- return '.'.join(ver_list)
-
- def c_vk_version(self):
- patch = self.patch if self.patch is not None else 0
- ver_list = [str(self.major), str(self.minor), str(patch)]
- return 'VK_MAKE_VERSION(' + ', '.join(ver_list) + ')'
-
- def __int_ver(self):
- # This is just an expansion of VK_VERSION
- patch = self.patch if self.patch is not None else 0
- return (self.major << 22) | (self.minor << 12) | patch
-
- def __gt__(self, other):
- # If only one of them has a patch version, "ignore" it by making
- # other's patch version match self.
- if (self.patch is None) != (other.patch is None):
- other = copy.copy(other)
- other.patch = self.patch
-
- return self.__int_ver() > other.__int_ver()
-
-
-MAX_API_VERSION = VkVersion(MAX_API_VERSION)
-
-def _init_exts_from_xml(xml):
- """ Walk the Vulkan XML and fill out extra extension information. """
-
- xml = et.parse(xml)
-
- ext_name_map = {}
- for ext in EXTENSIONS:
- ext_name_map[ext.name] = ext
-
- for ext_elem in xml.findall('.extensions/extension'):
- ext_name = ext_elem.attrib['name']
- if ext_name not in ext_name_map:
- continue
-
- ext = ext_name_map[ext_name]
- ext.type = ext_elem.attrib['type']
- ext.promotedto = ext_elem.attrib.get('promotedto', None)
- try:
- ext.requires = ext_elem.attrib['requires'].split(',')
- except KeyError:
- ext.requires = []
-
- def extra_deps(ext):
- if ext.type == 'instance':
- check = 'instance->enabled_extensions.{}'.format(ext.name[3:])
- if ext.promotedto is not None:
- # the xml contains values like VK_VERSION_1_1, but we need to
- # translate them to VK_API_VERSION_1_1 for the apiVersion check
- api_ver = ext.promotedto.replace('VK_VER', 'VK_API_VER')
- check = '({} || instance->apiVersion >= {})'.format(check, api_ver)
- return set([check])
-
- deps = set()
- for dep in ext.requires:
- deps |= extra_deps(ext_name_map[dep])
-
- return deps
-
- for ext in EXTENSIONS:
- if ext.type == 'device':
- for dep in extra_deps(ext):
- ext.enable += ' && ' + dep
-
-_TEMPLATE_H = Template(COPYRIGHT + """
-#ifndef RADV_EXTENSIONS_H
-#define RADV_EXTENSIONS_H
-
-enum {
- RADV_INSTANCE_EXTENSION_COUNT = ${len(instance_extensions)},
- RADV_DEVICE_EXTENSION_COUNT = ${len(device_extensions)},
-};
-
-struct radv_instance_extension_table {
- union {
- bool extensions[RADV_INSTANCE_EXTENSION_COUNT];
- struct {
-%for ext in instance_extensions:
- bool ${ext.name[3:]};
-%endfor
- };
- };
-};
-
-struct radv_device_extension_table {
- union {
- bool extensions[RADV_DEVICE_EXTENSION_COUNT];
- struct {
-%for ext in device_extensions:
- bool ${ext.name[3:]};
-%endfor
- };
- };
-};
-
-extern const VkExtensionProperties radv_instance_extensions[RADV_INSTANCE_EXTENSION_COUNT];
-extern const VkExtensionProperties radv_device_extensions[RADV_DEVICE_EXTENSION_COUNT];
-extern const struct radv_instance_extension_table radv_supported_instance_extensions;
-
-
-struct radv_physical_device;
-
-void radv_fill_device_extension_table(const struct radv_physical_device *device,
- struct radv_device_extension_table* table);
-#endif
-""")
-
-_TEMPLATE_C = Template(COPYRIGHT + """
-#include "radv_private.h"
-
-#include "vk_util.h"
-
-/* Convert the VK_USE_PLATFORM_* defines to booleans */
-%for platform in ['ANDROID_KHR', 'WAYLAND_KHR', 'XCB_KHR', 'XLIB_KHR', 'DISPLAY_KHR', 'XLIB_XRANDR_EXT']:
-#ifdef VK_USE_PLATFORM_${platform}
-# undef VK_USE_PLATFORM_${platform}
-# define VK_USE_PLATFORM_${platform} true
-#else
-# define VK_USE_PLATFORM_${platform} false
-#endif
-%endfor
-
-/* And ANDROID too */
-#ifdef ANDROID
-# undef ANDROID
-# define ANDROID true
-#else
-# define ANDROID false
-#endif
-
-#define RADV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\
- VK_USE_PLATFORM_XCB_KHR || \\
- VK_USE_PLATFORM_XLIB_KHR || \\
- VK_USE_PLATFORM_DISPLAY_KHR)
-
-
-const VkExtensionProperties radv_instance_extensions[RADV_INSTANCE_EXTENSION_COUNT] = {
-%for ext in instance_extensions:
- {"${ext.name}", ${ext.ext_version}},
-%endfor
-};
-
-const VkExtensionProperties radv_device_extensions[RADV_DEVICE_EXTENSION_COUNT] = {
-%for ext in device_extensions:
- {"${ext.name}", ${ext.ext_version}},
-%endfor
-};
-
-const struct radv_instance_extension_table radv_supported_instance_extensions = {
-%for ext in instance_extensions:
- .${ext.name[3:]} = ${ext.enable},
-%endfor
-};
-
-void radv_fill_device_extension_table(const struct radv_physical_device *device,
- struct radv_device_extension_table* table)
-{
- const struct radv_instance *instance = device->instance;
-%for ext in device_extensions:
- table->${ext.name[3:]} = ${ext.enable};
-%endfor
-}
-
-VkResult radv_EnumerateInstanceVersion(
- uint32_t* pApiVersion)
-{
- *pApiVersion = ${MAX_API_VERSION.c_vk_version()};
- return VK_SUCCESS;
-}
-
-uint32_t
-radv_physical_device_api_version(struct radv_physical_device *dev)
-{
- uint32_t override = vk_get_version_override();
- uint32_t version = VK_MAKE_VERSION(1, 0, 68);
- if (dev->rad_info.has_syncobj_wait_for_submit)
- version = ${MAX_API_VERSION.c_vk_version()};
-
- return override ? MIN2(override, version) : version;
-}
-""")
+MAX_API_VERSION = VkVersion('0.0.0')
+for version in API_VERSIONS:
+ version.version = VkVersion(version.version)
+ assert version.version > MAX_API_VERSION
+ MAX_API_VERSION = version.version
if __name__ == '__main__':
parser = argparse.ArgumentParser()
dest='xml_files')
args = parser.parse_args()
- for filename in args.xml_files:
- _init_exts_from_xml(filename)
-
- for ext in EXTENSIONS:
- assert ext.type == 'instance' or ext.type == 'device'
-
- template_env = {
- 'MAX_API_VERSION': MAX_API_VERSION,
- 'instance_extensions': [e for e in EXTENSIONS if e.type == 'instance'],
- 'device_extensions': [e for e in EXTENSIONS if e.type == 'device'],
- }
-
- with open(args.out_c, 'w') as f:
- f.write(_TEMPLATE_C.render(**template_env))
- with open(args.out_h, 'w') as f:
- f.write(_TEMPLATE_H.render(**template_env))
+ gen_extensions('radv', args.xml_files, API_VERSIONS, MAX_API_VERSION, EXTENSIONS, args.out_c, args.out_h)
projects / mesa.git / blobdiff