From a0b7e3d83e6e82fe634f3d71dc2891778044ea11 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 16 Feb 2021 14:17:20 +1000 Subject: [PATCH] lavapipe: Define supported extensions in C One less python generator, like anv/radv Acked-by: Jason Ekstrand Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/frontends/lavapipe/lvp_device.c | 91 ++++++++++- src/gallium/frontends/lavapipe/lvp_extensions.py | 188 ----------------------- src/gallium/frontends/lavapipe/lvp_private.h | 3 - src/gallium/frontends/lavapipe/meson.build | 13 +- 4 files changed, 90 insertions(+), 205 deletions(-) delete mode 100644 src/gallium/frontends/lavapipe/lvp_extensions.py diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 4bc91a8..2158f97 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -38,6 +38,93 @@ #include "util/timespec.h" #include "os_time.h" +#if defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ + defined(VK_USE_PLATFORM_WIN32_KHR) || \ + defined(VK_USE_PLATFORM_XCB_KHR) || \ + defined(VK_USE_PLATFORM_XLIB_KHR) || \ + defined(VK_USE_PLATFORM_DISPLAY_KHR) +#define LVP_USE_WSI_PLATFORM +#endif +#define LVP_API_VERSION VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION) + +VKAPI_ATTR VkResult VKAPI_CALL lvp_EnumerateInstanceVersion(uint32_t* pApiVersion) +{ + *pApiVersion = LVP_API_VERSION; + return VK_SUCCESS; +} + +static const struct vk_instance_extension_table lvp_instance_extensions_supported = { + .KHR_device_group_creation = true, + .KHR_external_fence_capabilities = true, + .KHR_external_memory_capabilities = true, + .KHR_external_semaphore_capabilities = true, + .KHR_get_physical_device_properties2 = true, + .EXT_debug_report = true, +#ifdef LVP_USE_WSI_PLATFORM + .KHR_get_surface_capabilities2 = true, + .KHR_surface = true, + .KHR_surface_protected_capabilities = true, +#endif +#ifdef VK_USE_PLATFORM_WAYLAND_KHR + .KHR_wayland_surface = true, +#endif +#ifdef VK_USE_PLATFORM_WIN32_KHR + .KHR_win32_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XCB_KHR + .KHR_xcb_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XLIB_KHR + .KHR_xlib_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT + .EXT_acquire_xlib_display = true, +#endif +#ifdef VK_USE_PLATFORM_DISPLAY_KHR + .KHR_display = true, + .KHR_get_display_properties2 = true, + .EXT_direct_mode_display = true, + .EXT_display_surface_counter = true, +#endif +}; + +static const struct vk_device_extension_table lvp_device_extensions_supported = { + .KHR_bind_memory2 = true, + .KHR_dedicated_allocation = true, + .KHR_descriptor_update_template = true, + .KHR_device_group = true, + .KHR_draw_indirect_count = true, + .KHR_driver_properties = true, + .KHR_external_fence = true, + .KHR_external_memory = true, + .KHR_external_semaphore = true, + .KHR_get_memory_requirements2 = true, +#ifdef LVP_USE_WSI_PLATFORM + .KHR_incremental_present = true, +#endif + .KHR_maintenance1 = true, + .KHR_maintenance2 = true, + .KHR_maintenance3 = true, + .KHR_push_descriptor = true, + .KHR_relaxed_block_layout = true, + .KHR_sampler_mirror_clamp_to_edge = true, + .KHR_shader_draw_parameters = true, + .KHR_storage_buffer_storage_class = true, +#ifdef LVP_USE_WSI_PLATFORM + .KHR_swapchain = true, +#endif + .EXT_calibrated_timestamps = true, + .EXT_conditional_rendering = true, + .EXT_index_type_uint8 = true, + .EXT_post_depth_coverage = true, + .EXT_private_data = true, + .EXT_shader_stencil_export = true, + .EXT_transform_feedback = true, + .EXT_vertex_attribute_divisor = true, + .GOOGLE_decorate_string = true, + .GOOGLE_hlsl_functionality1 = true, +}; + static VkResult VKAPI_CALL lvp_physical_device_init(struct lvp_physical_device *device, struct lvp_instance *instance, @@ -61,7 +148,7 @@ lvp_physical_device_init(struct lvp_physical_device *device, return vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY); device->max_images = device->pscreen->get_shader_param(device->pscreen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_SHADER_IMAGES); - lvp_physical_device_get_supported_extensions(device, &device->vk.supported_extensions); + device->vk.supported_extensions = lvp_device_extensions_supported; result = lvp_init_wsi(device); if (result != VK_SUCCESS) { vk_physical_device_finish(&device->vk); @@ -541,7 +628,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties(VkPhysicalDevice phys }; *pProperties = (VkPhysicalDeviceProperties) { - .apiVersion = VK_MAKE_VERSION(1, 0, 2), + .apiVersion = LVP_API_VERSION, .driverVersion = 1, .vendorID = VK_VENDOR_ID_MESA, .deviceID = 0, diff --git a/src/gallium/frontends/lavapipe/lvp_extensions.py b/src/gallium/frontends/lavapipe/lvp_extensions.py deleted file mode 100644 index ec321e4..0000000 --- a/src/gallium/frontends/lavapipe/lvp_extensions.py +++ /dev/null @@ -1,188 +0,0 @@ -COPYRIGHT = """\ -/* - * Copyright 2017 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -""" - -import argparse -import os.path -import re -import sys - -VULKAN_UTIL = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../vulkan/util')) -sys.path.append(VULKAN_UTIL) - -from vk_extensions import * -from vk_extensions_gen import * - -MAX_API_VERSION = '1.1.107' - -# 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', False), - ApiVersion('1.2.131', False), -] - -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 -# cannot access the driver's implementation. Moreoever, if the driver exposes -# 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_KHR_8bit_storage', 1, False), - Extension('VK_KHR_16bit_storage', 1, False), - Extension('VK_KHR_bind_memory2', 1, True), - Extension('VK_KHR_create_renderpass2', 1, False), - Extension('VK_KHR_dedicated_allocation', 1, True), - Extension('VK_KHR_depth_stencil_resolve', 1, False), - 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, True), - Extension('VK_KHR_external_fence_capabilities', 1, True), - Extension('VK_KHR_external_fence_fd', 1, False), - Extension('VK_KHR_external_memory', 1, True), - Extension('VK_KHR_external_memory_capabilities', 1, True), - Extension('VK_KHR_external_memory_fd', 1, False), - Extension('VK_KHR_external_semaphore', 1, True), - Extension('VK_KHR_external_semaphore_capabilities', 1, True), - Extension('VK_KHR_external_semaphore_fd', 1, False), - 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, 'LVP_HAS_SURFACE'), - Extension('VK_KHR_image_format_list', 1, False), - Extension('VK_KHR_imageless_framebuffer', 1, False), - Extension('VK_KHR_incremental_present', 1, 'LVP_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, False), - Extension('VK_KHR_pipeline_executable_properties', 1, False), - 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, False), - Extension('VK_KHR_shader_atomic_int64', 1, False), - Extension('VK_KHR_shader_draw_parameters', 1, True), - Extension('VK_KHR_shader_float16_int8', 1, False), - Extension('VK_KHR_storage_buffer_storage_class', 1, True), - Extension('VK_KHR_surface', 25, 'LVP_HAS_SURFACE'), - Extension('VK_KHR_surface_protected_capabilities', 1, 'LVP_HAS_SURFACE'), - Extension('VK_KHR_swapchain', 68, 'LVP_HAS_SURFACE'), - Extension('VK_KHR_uniform_buffer_standard_layout', 1, False), - Extension('VK_KHR_variable_pointers', 1, False), - Extension('VK_KHR_wayland_surface', 6, 'VK_USE_PLATFORM_WAYLAND_KHR'), - Extension('VK_KHR_win32_surface', 6, 'VK_USE_PLATFORM_WIN32_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, False), - Extension('VK_EXT_calibrated_timestamps', 1, True), - Extension('VK_EXT_conditional_rendering', 1, True), - Extension('VK_EXT_conservative_rasterization', 1, False), - Extension('VK_EXT_debug_report', 9, True), - Extension('VK_EXT_depth_clip_enable', 1, False), - Extension('VK_EXT_depth_range_unrestricted', 1, False), - Extension('VK_EXT_descriptor_indexing', 2, False), - Extension('VK_EXT_direct_mode_display', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), - Extension('VK_EXT_discard_rectangles', 1, False), - 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, False), - Extension('VK_EXT_global_priority', 1, False), - Extension('VK_EXT_host_query_reset', 1, False), - Extension('VK_EXT_index_type_uint8', 1, True), - Extension('VK_EXT_inline_uniform_block', 1, False), - Extension('VK_EXT_memory_budget', 1, False), - Extension('VK_EXT_memory_priority', 1, False), - Extension('VK_EXT_pci_bus_info', 2, False), - Extension('VK_EXT_pipeline_creation_feedback', 1, False), - Extension('VK_EXT_post_depth_coverage', 1, True), - Extension('VK_EXT_private_data', 1, True), - Extension('VK_EXT_queue_family_foreign', 1, False), - Extension('VK_EXT_sample_locations', 1, False), - Extension('VK_EXT_sampler_filter_minmax', 1, False), - Extension('VK_EXT_scalar_block_layout', 1, False), - Extension('VK_EXT_shader_stencil_export', 1, True), - Extension('VK_EXT_shader_subgroup_ballot', 1, False), - Extension('VK_EXT_shader_subgroup_vote', 1, False), - Extension('VK_EXT_shader_viewport_index_layer', 1, False), - Extension('VK_EXT_transform_feedback', 1, True), - Extension('VK_EXT_vertex_attribute_divisor', 3, True), - Extension('VK_EXT_ycbcr_image_arrays', 1, False), - Extension('VK_ANDROID_native_buffer', 5, False), - 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) - -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() - parser.add_argument('--out-c', help='Output C file.', required=True) - parser.add_argument('--out-h', help='Output H file.', required=True) - parser.add_argument('--xml', - help='Vulkan API XML file.', - required=True, - action='append', - dest='xml_files') - args = parser.parse_args() - - gen_extensions('lvp', args.xml_files, API_VERSIONS, MAX_API_VERSION, - EXTENSIONS, args.out_c, args.out_h) diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index c37111a..57e5af3 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -48,7 +48,6 @@ typedef uint32_t xcb_window_t; #include #include -#include "lvp_extensions.h" #include "lvp_entrypoints.h" #include "vk_device.h" #include "vk_instance.h" @@ -229,8 +228,6 @@ struct lvp_instance { VkResult lvp_init_wsi(struct lvp_physical_device *physical_device); void lvp_finish_wsi(struct lvp_physical_device *physical_device); -extern const struct vk_instance_extension_table lvp_instance_extensions_supported; -uint32_t lvp_physical_device_api_version(struct lvp_physical_device *dev); bool lvp_physical_device_extension_supported(struct lvp_physical_device *dev, const char *name); diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build index b7a6b09..d084c92 100644 --- a/src/gallium/frontends/lavapipe/meson.build +++ b/src/gallium/frontends/lavapipe/meson.build @@ -9,17 +9,6 @@ lvp_entrypoints = custom_target( ], ) -lvp_extensions_c = custom_target( - 'lvp_extensions.c', - input : ['lvp_extensions.py', vk_api_xml], - output : ['lvp_extensions.c', 'lvp_extensions.h'], - command : [ - prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@', - '--out-h', '@OUTPUT1@' - ], - depend_files : vk_extensions_gen, -) - liblvp_files = files( 'lvp_device.c', 'lvp_cmd_buffer.c', @@ -62,7 +51,7 @@ endif liblavapipe_st = static_library( 'lavapipe_st', - [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h], + [liblvp_files, lvp_entrypoints, sha1_h], link_with : [ libvulkan_wsi ], c_args : [ lvp_flags ], gnu_symbol_visibility : 'hidden', -- 2.7.4