X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_extensions.py;h=6fff293dee4368ac81ad010ddbeba3912e6b419f;hb=4787bc944a2d219dd04201eef699d9f999b479b8;hp=d0b70a04055857b3a429299b148202aee5840738;hpb=d6b65222df53677e5d3b2f6f42163387725d57b8;p=mesa.git diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index d0b70a04055..6fff293dee4 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -24,18 +24,15 @@ COPYRIGHT = """\ */ """ -import argparse import copy import re -import xml.etree.cElementTree as et def _bool_to_c_expr(b): if b is True: - return 'true'; - elif b is False: - return 'false'; - else: - return b; + return 'true' + if b is False: + return 'false' + return b class Extension: def __init__(self, name, ext_version, enable): @@ -44,20 +41,22 @@ class Extension: self.enable = _bool_to_c_expr(enable) class ApiVersion: - def __init__(self, max_patch_version, enable): - self.max_patch_version = max_patch_version + def __init__(self, version, enable): + self.version = version self.enable = _bool_to_c_expr(enable) +API_PATCH_VERSION = 102 + # 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. API_VERSIONS = [ - ApiVersion('1.0.57', True), + ApiVersion('1.0', True), # DRM_IOCTL_SYNCOBJ_WAIT is required for VK_KHR_external_fence which is a # required core feature in Vulkan 1.1 - ApiVersion('1.1.0', 'device->has_syncobj_wait'), + ApiVersion('1.1', 'device->has_syncobj_wait'), ] MAX_API_VERSION = None # Computed later @@ -68,13 +67,18 @@ MAX_API_VERSION = None # Computed later # the those extension strings, then tests dEQP-VK.api.info.instance.extensions # and dEQP-VK.api.info.device fail due to the duplicated strings. EXTENSIONS = [ - Extension('VK_ANDROID_native_buffer', 5, 'ANDROID'), + Extension('VK_KHR_8bit_storage', 1, 'device->info.gen >= 8'), Extension('VK_KHR_16bit_storage', 1, 'device->info.gen >= 8'), Extension('VK_KHR_bind_memory2', 1, True), + Extension('VK_KHR_create_renderpass2', 1, True), Extension('VK_KHR_dedicated_allocation', 1, True), + Extension('VK_KHR_depth_stencil_resolve', 1, True), Extension('VK_KHR_descriptor_update_template', 1, True), Extension('VK_KHR_device_group', 1, True), Extension('VK_KHR_device_group_creation', 1, True), + Extension('VK_KHR_display', 23, 'VK_USE_PLATFORM_DISPLAY_KHR'), + Extension('VK_KHR_draw_indirect_count', 1, True), + Extension('VK_KHR_driver_properties', 1, True), Extension('VK_KHR_external_fence', 1, 'device->has_syncobj_wait'), Extension('VK_KHR_external_fence_capabilities', 1, True), @@ -86,6 +90,7 @@ EXTENSIONS = [ Extension('VK_KHR_external_semaphore', 1, True), Extension('VK_KHR_external_semaphore_capabilities', 1, True), Extension('VK_KHR_external_semaphore_fd', 1, True), + Extension('VK_KHR_get_display_properties2', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), Extension('VK_KHR_get_memory_requirements2', 1, True), Extension('VK_KHR_get_physical_device_properties2', 1, True), Extension('VK_KHR_get_surface_capabilities2', 1, 'ANV_HAS_SURFACE'), @@ -94,6 +99,7 @@ EXTENSIONS = [ Extension('VK_KHR_maintenance1', 1, True), Extension('VK_KHR_maintenance2', 1, True), Extension('VK_KHR_maintenance3', 1, True), + Extension('VK_KHR_multiview', 1, True), Extension('VK_KHR_push_descriptor', 1, True), Extension('VK_KHR_relaxed_block_layout', 1, True), Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True), @@ -106,13 +112,56 @@ EXTENSIONS = [ Extension('VK_KHR_wayland_surface', 6, '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_KHR_multiview', 1, True), + Extension('VK_EXT_acquire_xlib_display', 1, 'VK_USE_PLATFORM_XLIB_XRANDR_EXT'), + Extension('VK_EXT_buffer_device_address', 1, + 'device->use_softpin && device->info.gen >= 8'), + Extension('VK_EXT_calibrated_timestamps', 1, True), + Extension('VK_EXT_conditional_rendering', 1, 'device->info.gen >= 8 || device->info.is_haswell'), Extension('VK_EXT_debug_report', 8, True), + Extension('VK_EXT_depth_clip_enable', 1, True), + Extension('VK_EXT_direct_mode_display', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), + Extension('VK_EXT_display_control', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), + Extension('VK_EXT_display_surface_counter', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), Extension('VK_EXT_external_memory_dma_buf', 1, True), + Extension('VK_EXT_external_memory_host', 1, True), Extension('VK_EXT_global_priority', 1, 'device->has_context_priority'), + Extension('VK_EXT_inline_uniform_block', 1, True), + Extension('VK_EXT_pci_bus_info', 2, True), + Extension('VK_EXT_post_depth_coverage', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_sampler_filter_minmax', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_scalar_block_layout', 1, True), + Extension('VK_EXT_shader_stencil_export', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_shader_viewport_index_layer', 1, True), + Extension('VK_EXT_transform_feedback', 1, True), + Extension('VK_EXT_vertex_attribute_divisor', 3, True), + Extension('VK_EXT_ycbcr_image_arrays', 1, True), + Extension('VK_ANDROID_external_memory_android_hardware_buffer', 3, 'ANDROID'), + Extension('VK_ANDROID_native_buffer', 5, 'ANDROID'), + Extension('VK_GOOGLE_decorate_string', 1, True), + Extension('VK_GOOGLE_hlsl_functionality1', 1, True), ] +# Sort the extension list the way we expect: KHR, then EXT, then vendors +# alphabetically. For digits, read them as a whole number sort that. +# eg.: VK_KHR_8bit_storage < VK_KHR_16bit_storage < VK_EXT_acquire_xlib_display +def extension_order(ext): + order = [] + for substring in re.split('(KHR|EXT|[0-9]+)', ext.name): + if substring == 'KHR': + order.append(1) + if substring == 'EXT': + order.append(2) + elif substring.isdigit(): + order.append(int(substring)) + else: + order.append(substring) + return order +for i in range(len(EXTENSIONS) - 1): + if extension_order(EXTENSIONS[i + 1]) < extension_order(EXTENSIONS[i]): + print(EXTENSIONS[i + 1].name + ' should come before ' + EXTENSIONS[i].name) + exit(1) + class VkVersion: def __init__(self, string): split = string.split('.') @@ -128,7 +177,7 @@ class VkVersion: # 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) + assert str(self) == string def __str__(self): ver_list = [str(self.major), str(self.minor)] @@ -146,18 +195,20 @@ class VkVersion: patch = self.patch if self.patch is not None else 0 return (self.major << 22) | (self.minor << 12) | patch - def __cmp__(self, other): + 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().__cmp__(other.__int_ver()) + return self.__int_ver() > other.__int_ver() + MAX_API_VERSION = VkVersion('0.0.0') for version in API_VERSIONS: - version.max_patch_version = VkVersion(version.max_patch_version) - assert version.max_patch_version > MAX_API_VERSION - MAX_API_VERSION = version.max_patch_version + version.version = VkVersion(version.version) + version.version.patch = API_PATCH_VERSION + assert version.version > MAX_API_VERSION + MAX_API_VERSION = version.version