X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_extensions.py;h=f181c1333649eb3f07fec4b62855f43ab6958491;hb=b1ef1c1211373f9336aaf87de865ef7f0c29fc44;hp=34d63ed90c334848523e7363f32ab85f6b83835a;hpb=b027ad66d729e31430d63406e70ac52d373e8fec;p=mesa.git diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 34d63ed90c3..f181c133364 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -31,7 +31,7 @@ import xml.etree.cElementTree as et from mako.template import Template -MAX_API_VERSION = '1.1.107' +MAX_API_VERSION = '1.2.128' class Extension: def __init__(self, name, ext_version, enable): @@ -50,9 +50,11 @@ class Extension: # 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_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, True), + Extension('VK_KHR_16bit_storage', 1, '!device->use_aco || device->rad_info.chip_class >= GFX8'), 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_dedicated_allocation', 1, True), Extension('VK_KHR_depth_stencil_resolve', 1, True), @@ -85,13 +87,21 @@ EXTENSIONS = [ 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_shader_atomic_int64', 1, 'HAVE_LLVM >= 0x0900'), + Extension('VK_KHR_separate_depth_stencil_layouts', 1, True), + Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9'), + Extension('VK_KHR_shader_clock', 1, True), Extension('VK_KHR_shader_draw_parameters', 1, True), - Extension('VK_KHR_shader_float16_int8', 1, True), + Extension('VK_KHR_shader_float_controls', 1, True), + Extension('VK_KHR_shader_float16_int8', 1, '!device->use_aco || device->rad_info.chip_class >= GFX8'), + Extension('VK_KHR_shader_non_semantic_info', 1, True), + Extension('VK_KHR_shader_subgroup_extended_types', 1, '!device->use_aco'), + 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_wayland_surface', 6, 'VK_USE_PLATFORM_WAYLAND_KHR'), @@ -99,7 +109,7 @@ EXTENSIONS = [ 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'), + Extension('VK_KHR_8bit_storage', 1, '!device->use_aco || device->rad_info.chip_class >= GFX8'), 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), @@ -119,36 +129,50 @@ EXTENSIONS = [ Extension('VK_EXT_host_query_reset', 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_feedback', 1, True), Extension('VK_EXT_post_depth_coverage', 1, 'device->rad_info.chip_class >= GFX10'), 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_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_texel_buffer_alignment', 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_AMD_buffer_marker', 1, 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->rad_info.chip_class >= GFX9'), - Extension('VK_AMD_gpu_shader_int16', 1, 'device->rad_info.chip_class >= GFX9'), + Extension('VK_AMD_gpu_shader_half_float', 1, '!device->use_aco && device->rad_info.has_double_rate_fp16'), + Extension('VK_AMD_gpu_shader_int16', 1, '!device->use_aco && device->rad_info.has_double_rate_fp16'), + 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_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_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_NV_compute_shader_derivatives', 1, True), ] class VkVersion: @@ -236,9 +260,86 @@ def _init_exts_from_xml(xml): for ext in EXTENSIONS: if ext.type == 'device': + ext.enable = '(' + ext.enable + ')' for dep in extra_deps(ext): ext.enable += ' && ' + dep +# 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, + + # 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_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_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_GOOGLE_display_timing": 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 GetExtensionCondition(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) + _TEMPLATE_H = Template(COPYRIGHT + """ #ifndef RADV_EXTENSIONS_H #define RADV_EXTENSIONS_H @@ -303,6 +404,7 @@ _TEMPLATE_C = Template(COPYRIGHT + """ # define ANDROID true #else # define ANDROID false +# define ANDROID_API_LEVEL 0 #endif #define RADV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\ @@ -325,7 +427,7 @@ const VkExtensionProperties radv_device_extensions[RADV_DEVICE_EXTENSION_COUNT] const struct radv_instance_extension_table radv_supported_instance_extensions = { %for ext in instance_extensions: - .${ext.name[3:]} = ${ext.enable}, + .${ext.name[3:]} = ${GetExtensionCondition(ext.name, ext.enable)}, %endfor }; @@ -334,7 +436,7 @@ void radv_fill_device_extension_table(const struct radv_physical_device *device, { const struct radv_instance *instance = device->instance; %for ext in device_extensions: - table->${ext.name[3:]} = ${ext.enable}; + table->${ext.name[3:]} = ${GetExtensionCondition(ext.name, ext.enable)}; %endfor } @@ -378,6 +480,7 @@ if __name__ == '__main__': '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'], + 'GetExtensionCondition': GetExtensionCondition, } with open(args.out_c, 'w') as f: