X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_extensions.py;h=3da10c724b98867790bfa9331ccf8c47b49990ce;hb=4f17e9eef6f9f8a2986264b3da5157542983a1da;hp=e4404c59f34d35dea1f21d6a2c8c4ac0e1680db6;hpb=887041c7630e72c85d31712f3377d801239f22e4;p=mesa.git diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index e4404c59f34..3da10c724b9 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -45,7 +45,7 @@ class ApiVersion: self.version = version self.enable = _bool_to_c_expr(enable) -API_PATCH_VERSION = 102 +API_PATCH_VERSION = 131 # 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 @@ -53,10 +53,8 @@ API_PATCH_VERSION = 102 # available. API_VERSIONS = [ 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', 'device->has_syncobj_wait'), + ApiVersion('1.1', True), + ApiVersion('1.2', '!ANDROID'), ] MAX_API_VERSION = None # Computed later @@ -70,6 +68,7 @@ EXTENSIONS = [ 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_buffer_device_address', 1, 'device->has_a64_buffer_access'), Extension('VK_KHR_create_renderpass2', 1, True), Extension('VK_KHR_dedicated_allocation', 1, True), Extension('VK_KHR_depth_stencil_resolve', 1, True), @@ -95,52 +94,86 @@ EXTENSIONS = [ Extension('VK_KHR_get_physical_device_properties2', 1, True), Extension('VK_KHR_get_surface_capabilities2', 1, 'ANV_HAS_SURFACE'), Extension('VK_KHR_image_format_list', 1, True), + Extension('VK_KHR_imageless_framebuffer', 1, True), Extension('VK_KHR_incremental_present', 1, 'ANV_HAS_SURFACE'), 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_pipeline_executable_properties', 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), Extension('VK_KHR_sampler_ycbcr_conversion', 1, True), + Extension('VK_KHR_separate_depth_stencil_layouts', 1, True), + Extension('VK_KHR_shader_atomic_int64', 1, + 'device->info.gen >= 9 && device->use_softpin'), + Extension('VK_KHR_shader_clock', 1, True), Extension('VK_KHR_shader_draw_parameters', 1, True), + Extension('VK_KHR_shader_float16_int8', 1, 'device->info.gen >= 8'), + Extension('VK_KHR_shader_float_controls', 1, 'device->info.gen >= 8'), + Extension('VK_KHR_shader_non_semantic_info', 1, True), + Extension('VK_KHR_shader_subgroup_extended_types', 1, 'device->info.gen >= 8'), + Extension('VK_KHR_spirv_1_4', 1, True), Extension('VK_KHR_storage_buffer_storage_class', 1, True), Extension('VK_KHR_surface', 25, 'ANV_HAS_SURFACE'), - Extension('VK_KHR_swapchain', 68, 'ANV_HAS_SURFACE'), + Extension('VK_KHR_surface_protected_capabilities', 1, 'ANV_HAS_SURFACE'), + Extension('VK_KHR_swapchain', 70, 'ANV_HAS_SURFACE'), + Extension('VK_KHR_swapchain_mutable_format', 1, 'ANV_HAS_SURFACE'), + Extension('VK_KHR_timeline_semaphore', 1, True), + Extension('VK_KHR_uniform_buffer_standard_layout', 1, True), Extension('VK_KHR_variable_pointers', 1, True), + Extension('VK_KHR_vulkan_memory_model', 3, True), 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_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_buffer_device_address', 1, 'device->has_a64_buffer_access'), 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_descriptor_indexing', 2, + 'device->has_a64_buffer_access && device->has_bindless_images'), 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_fragment_shader_interlock', 1, 'device->info.gen >= 9'), Extension('VK_EXT_global_priority', 1, 'device->has_context_priority'), Extension('VK_EXT_host_query_reset', 1, True), + Extension('VK_EXT_image_drm_format_modifier', 1, False), + Extension('VK_EXT_index_type_uint8', 1, True), Extension('VK_EXT_inline_uniform_block', 1, True), + Extension('VK_EXT_line_rasterization', 1, True), + Extension('VK_EXT_memory_budget', 1, 'device->has_mem_available'), Extension('VK_EXT_pci_bus_info', 2, True), + Extension('VK_EXT_pipeline_creation_feedback', 1, True), Extension('VK_EXT_post_depth_coverage', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_queue_family_foreign', 1, 'ANDROID'), + Extension('VK_EXT_robustness2', 1, True), Extension('VK_EXT_sampler_filter_minmax', 1, 'device->info.gen >= 9'), Extension('VK_EXT_scalar_block_layout', 1, True), + Extension('VK_EXT_separate_stencil_usage', 1, True), + Extension('VK_EXT_shader_demote_to_helper_invocation', 1, True), Extension('VK_EXT_shader_stencil_export', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_shader_subgroup_ballot', 1, True), + Extension('VK_EXT_shader_subgroup_vote', 1, True), Extension('VK_EXT_shader_viewport_index_layer', 1, True), - Extension('VK_EXT_transform_feedback', 1, True), + Extension('VK_EXT_subgroup_size_control', 2, True), + Extension('VK_EXT_texel_buffer_alignment', 1, True), + Extension('VK_EXT_transform_feedback', 1, 'device->info.gen >= 8'), 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_ANDROID_native_buffer', 7, 'ANDROID'), Extension('VK_GOOGLE_decorate_string', 1, True), Extension('VK_GOOGLE_hlsl_functionality1', 1, True), + Extension('VK_INTEL_performance_query', 1, 'device->perf && device->perf->i915_perf_version >= 3'), + Extension('VK_INTEL_shader_integer_functions2', 1, 'device->info.gen >= 8'), + Extension('VK_NV_compute_shader_derivatives', 1, True), ] # Sort the extension list the way we expect: KHR, then EXT, then vendors @@ -213,3 +246,92 @@ for version in API_VERSIONS: version.version.patch = API_PATCH_VERSION assert version.version > MAX_API_VERSION MAX_API_VERSION = version.version + +# Mapping between extension name and the android version in which the extension +# was whitelisted in Android CTS. +allowed_android_version = { + # Allowed Instance KHR Extensions + "VK_KHR_surface": 26, + "VK_KHR_display": 26, + "VK_KHR_android_surface": 26, + "VK_KHR_mir_surface": 26, + "VK_KHR_wayland_surface": 26, + "VK_KHR_win32_surface": 26, + "VK_KHR_xcb_surface": 26, + "VK_KHR_xlib_surface": 26, + "VK_KHR_get_physical_device_properties2": 26, + "VK_KHR_get_surface_capabilities2": 26, + "VK_KHR_external_memory_capabilities": 28, + "VK_KHR_external_semaphore_capabilities": 28, + "VK_KHR_external_fence_capabilities": 28, + "VK_KHR_device_group_creation": 28, + "VK_KHR_get_display_properties2": 29, + "VK_KHR_surface_protected_capabilities": 29, + + # Allowed Device KHR Extensions + "VK_KHR_swapchain": 26, + "VK_KHR_display_swapchain": 26, + "VK_KHR_sampler_mirror_clamp_to_edge": 26, + "VK_KHR_shader_draw_parameters": 26, + "VK_KHR_shader_float_controls": 29, + "VK_KHR_shader_float16_int8": 29, + "VK_KHR_maintenance1": 26, + "VK_KHR_push_descriptor": 26, + "VK_KHR_descriptor_update_template": 26, + "VK_KHR_incremental_present": 26, + "VK_KHR_shared_presentable_image": 26, + "VK_KHR_storage_buffer_storage_class": 28, + "VK_KHR_8bit_storage": 29, + "VK_KHR_16bit_storage": 28, + "VK_KHR_get_memory_requirements2": 28, + "VK_KHR_external_memory": 28, + "VK_KHR_external_memory_fd": 28, + "VK_KHR_external_memory_win32": 28, + "VK_KHR_external_semaphore": 28, + "VK_KHR_external_semaphore_fd": 28, + "VK_KHR_external_semaphore_win32": 28, + "VK_KHR_external_fence": 28, + "VK_KHR_external_fence_fd": 28, + "VK_KHR_external_fence_win32": 28, + "VK_KHR_win32_keyed_mutex": 28, + "VK_KHR_dedicated_allocation": 28, + "VK_KHR_variable_pointers": 28, + "VK_KHR_relaxed_block_layout": 28, + "VK_KHR_bind_memory2": 28, + "VK_KHR_maintenance2": 28, + "VK_KHR_image_format_list": 28, + "VK_KHR_sampler_ycbcr_conversion": 28, + "VK_KHR_device_group": 28, + "VK_KHR_multiview": 28, + "VK_KHR_maintenance3": 28, + "VK_KHR_draw_indirect_count": 28, + "VK_KHR_create_renderpass2": 28, + "VK_KHR_depth_stencil_resolve": 29, + "VK_KHR_driver_properties": 28, + "VK_KHR_swapchain_mutable_format": 29, + "VK_KHR_shader_atomic_int64": 29, + "VK_KHR_vulkan_memory_model": 29, + + "VK_GOOGLE_display_timing": 26, + "VK_ANDROID_native_buffer": 26, + "VK_ANDROID_external_memory_android_hardware_buffer": 28, +} + +# Extensions with these prefixes are checked in Android CTS, and thus must be +# whitelisted per the preceding dict. +android_extension_whitelist_prefixes = ( + "VK_KHX", + "VK_KHR", + "VK_GOOGLE", + "VK_ANDROID" +) + +def get_extension_condition(ext_name, condition): + """ If |ext_name| is an extension that Android CTS cares about, prepend + a condition to ensure that the extension is only enabled for Android + versions in which the extension is whitelisted in CTS. """ + if not ext_name.startswith(android_extension_whitelist_prefixes): + return condition + allowed_version = allowed_android_version.get(ext_name, 9999) + return "(!ANDROID || ANDROID_API_LEVEL >= %d) && (%s)" % (allowed_version, + condition)