X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_extensions.py;h=1fae95a5de17367b9782e3be95a2f5a7b6f05a61;hb=493b3ada9b177e1294168e27cf4ab2b9886a33e4;hp=ac6ec8744e0ec741b1b8fdf3aac28b4723a9dad2;hpb=4db78f3a6b20cfd790dd0ac35d67f4abe94ea530;p=mesa.git diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index ac6ec8744e0..1fae95a5de1 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.0.57' +MAX_API_VERSION = '1.1.90' class Extension: def __init__(self, name, ext_version, enable): @@ -51,9 +51,15 @@ class Extension: # and dEQP-VK.api.info.device fail due to the duplicated strings. EXTENSIONS = [ 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_bind_memory2', 1, True), + Extension('VK_KHR_create_renderpass2', 1, True), Extension('VK_KHR_dedicated_allocation', 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_draw_indirect_count', 1, True), + Extension('VK_KHR_driver_properties', 1, True), Extension('VK_KHR_external_fence', 1, 'device->rad_info.has_syncobj_wait_for_submit'), Extension('VK_KHR_external_fence_capabilities', 1, True), Extension('VK_KHR_external_fence_fd', 1, 'device->rad_info.has_syncobj_wait_for_submit'), @@ -63,33 +69,63 @@ EXTENSIONS = [ Extension('VK_KHR_external_semaphore', 1, 'device->rad_info.has_syncobj'), Extension('VK_KHR_external_semaphore_capabilities', 1, True), Extension('VK_KHR_external_semaphore_fd', 1, 'device->rad_info.has_syncobj'), + 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, True), + Extension('VK_KHR_get_surface_capabilities2', 1, 'RADV_HAS_SURFACE'), Extension('VK_KHR_image_format_list', 1, True), - Extension('VK_KHR_incremental_present', 1, True), + Extension('VK_KHR_incremental_present', 1, 'RADV_HAS_SURFACE'), Extension('VK_KHR_maintenance1', 1, True), Extension('VK_KHR_maintenance2', 1, True), + Extension('VK_KHR_maintenance3', 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_shader_draw_parameters', 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_variable_pointers', 1, 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_KHX_multiview', 1, '!ANDROID'), + Extension('VK_KHR_multiview', 1, True), + Extension('VK_KHR_display', 23, 'VK_USE_PLATFORM_DISPLAY_KHR'), + 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_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_clip_enable', 1, 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_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_memory_budget', 1, True), + Extension('VK_EXT_memory_priority', 1, True), + Extension('VK_EXT_pci_bus_info', 2, True), + Extension('VK_EXT_sampler_filter_minmax', 1, 'device->rad_info.chip_class >= CIK'), + Extension('VK_EXT_scalar_block_layout', 1, 'device->rad_info.chip_class >= CIK'), + Extension('VK_EXT_shader_viewport_index_layer', 1, True), + Extension('VK_EXT_shader_stencil_export', 1, True), + Extension('VK_EXT_transform_feedback', 1, True), + Extension('VK_EXT_vertex_attribute_divisor', 3, True), Extension('VK_AMD_draw_indirect_count', 1, True), - Extension('VK_AMD_rasterization_order', 1, 'device->rad_info.chip_class >= VI && device->rad_info.max_se >= 2'), + Extension('VK_AMD_gcn_shader', 1, True), + Extension('VK_AMD_rasterization_order', 1, 'device->has_out_of_order_rast'), + Extension('VK_AMD_shader_core_properties', 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), ] class VkVersion: @@ -116,7 +152,8 @@ class VkVersion: return '.'.join(ver_list) def c_vk_version(self): - ver_list = [str(self.major), str(self.minor), str(self.patch)] + 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): @@ -124,14 +161,15 @@ 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(MAX_API_VERSION) @@ -149,18 +187,34 @@ def _init_exts_from_xml(xml): if ext_name not in ext_name_map: continue - # Workaround for VK_ANDROID_native_buffer. Its element in - # vk.xml lists it as supported="disabled" and provides only a stub - # definition. Its element in Mesa's custom - # vk_android_native_buffer.xml, though, lists it as - # supported='android-vendor' and fully defines the extension. We want - # to skip the element in vk.xml. - if ext_elem.attrib['supported'] == 'disabled': - assert ext_name == 'VK_ANDROID_native_buffer' - 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 @@ -193,9 +247,9 @@ struct radv_device_extension_table { }; }; -const VkExtensionProperties radv_instance_extensions[RADV_INSTANCE_EXTENSION_COUNT]; -const VkExtensionProperties radv_device_extensions[RADV_DEVICE_EXTENSION_COUNT]; -const struct radv_instance_extension_table radv_supported_instance_extensions; +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; @@ -211,12 +265,12 @@ _TEMPLATE_C = Template(COPYRIGHT + """ #include "vk_util.h" /* Convert the VK_USE_PLATFORM_* defines to booleans */ -%for platform in ['ANDROID', 'WAYLAND', 'XCB', 'XLIB']: -#ifdef VK_USE_PLATFORM_${platform}_KHR -# undef VK_USE_PLATFORM_${platform}_KHR -# define VK_USE_PLATFORM_${platform}_KHR true +%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}_KHR false +# define VK_USE_PLATFORM_${platform} false #endif %endfor @@ -230,7 +284,9 @@ _TEMPLATE_C = Template(COPYRIGHT + """ #define RADV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\ VK_USE_PLATFORM_XCB_KHR || \\ - VK_USE_PLATFORM_XLIB_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: @@ -253,15 +309,25 @@ const struct radv_instance_extension_table radv_supported_instance_extensions = 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) { - return ${MAX_API_VERSION.c_vk_version()}; + if (!ANDROID && dev->rad_info.has_syncobj_wait_for_submit) + return ${MAX_API_VERSION.c_vk_version()}; + return VK_MAKE_VERSION(1, 0, 68); } """)