fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-20 05:50:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

venus: enable VK_EXT_host_image_copy support

Browse source 
Fill the core features and properties properly, and conditionally pass
through support of the extension based on the renderer venus protocol
spec version.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33757>
This commit is contained in:
Yiwei Zhang 2025-02-24 23:05:26 -08:00 • committed by Marge Bot
parent f3da8167d6
commit 577fa1793d
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/features.txt
View file

@ -524,7 +524,7 @@ Vulkan 1.4 -- all DONE: anv, lvp, nvk, radv/gfx8+, tu/a7xx+
VK_KHR_shader_float_controls2 DONE (anv, lvp, nvk, radv, tu, vn)
VK_KHR_shader_subgroup_rotate DONE (anv, lvp, nvk, radv, tu, vn)
VK_KHR_vertex_attribute_divisor DONE (anv, lvp, nvk, panvk, radv, tu, v3dv, vn)
VK_EXT_host_image_copy DONE (anv, lvp, nvk/Turing+, tu)
VK_EXT_host_image_copy DONE (anv, lvp, nvk/Turing+, tu, vn)
VK_EXT_pipeline_protected_access DONE (anv/gfx12+, vn)
VK_EXT_pipeline_robustness DONE (anv, lvp, nvk, panvk, radv, v3dv, tu, vn)

47
src/virtio/vulkan/vn_physical_device.c
View file

@ -138,6 +138,7 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
VkPhysicalDeviceDynamicRenderingLocalReadFeatures
dynamic_rendering_local_read;
VkPhysicalDeviceGlobalPriorityQueryFeatures global_priority_query;
VkPhysicalDeviceHostImageCopyFeatures host_image_copy;
VkPhysicalDeviceIndexTypeUint8Features index_type_uint8;
VkPhysicalDeviceLineRasterizationFeatures line_rasterization;
VkPhysicalDeviceMaintenance5Features maintenance_5;
@ -257,6 +258,7 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
VN_ADD_PNEXT(feats2, VULKAN_1_4_FEATURES, local_feats.vulkan_1_4);
} else {
VN_ADD_PNEXT_EXT(feats2, GLOBAL_PRIORITY_QUERY_FEATURES, local_feats.global_priority_query, exts->KHR_global_priority || exts->EXT_global_priority_query);
VN_ADD_PNEXT_EXT(feats2, HOST_IMAGE_COPY_FEATURES, local_feats.host_image_copy, exts->EXT_host_image_copy);
VN_ADD_PNEXT_EXT(feats2, INDEX_TYPE_UINT8_FEATURES, local_feats.index_type_uint8, exts->KHR_index_type_uint8 || exts->EXT_index_type_uint8);
VN_ADD_PNEXT_EXT(feats2, LINE_RASTERIZATION_FEATURES, local_feats.line_rasterization, exts->KHR_line_rasterization || exts->EXT_line_rasterization);
VN_ADD_PNEXT_EXT(feats2, MAINTENANCE_5_FEATURES, local_feats.maintenance_5, exts->KHR_maintenance5);
@ -311,10 +313,6 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
struct vk_features *feats = &physical_dev->base.base.supported_features;
vk_set_physical_device_features(feats, &feats2);
if (renderer_version >= VK_API_VERSION_1_4 &&
!physical_dev->base.base.supported_extensions.EXT_host_image_copy)
feats->hostImageCopy = false;
/* Enable features for extensions natively implemented in Venus driver.
* See vn_physical_device_get_native_extensions.
*/
@ -432,17 +430,6 @@ vn_physical_device_sanitize_properties(struct vn_physical_device *physical_dev)
props->conformanceVersion.patch = 0;
vn_physical_device_init_uuids(physical_dev);
if (physical_dev->renderer_version >= VK_API_VERSION_1_4 &&
!physical_dev->base.base.supported_extensions.EXT_host_image_copy) {
props->copySrcLayoutCount = 0;
props->pCopySrcLayouts = NULL;
props->copyDstLayoutCount = 0;
props->pCopyDstLayouts = NULL;
memset(props->optimalTilingLayoutUUID, 0,
sizeof(props->optimalTilingLayoutUUID));
props->identicalMemoryTypeRequirements = false;
}
}
static void
@ -487,6 +474,7 @@ vn_physical_device_init_properties(struct vn_physical_device *physical_dev)
/* Vulkan 1.4 */
VkPhysicalDeviceVulkan14Properties vulkan_1_4;
VkPhysicalDeviceHostImageCopyProperties host_image_copy;
VkPhysicalDeviceLineRasterizationProperties line_rasterization;
VkPhysicalDeviceMaintenance5Properties maintenance_5;
VkPhysicalDeviceMaintenance6Properties maintenance_6;
@ -558,8 +546,21 @@ vn_physical_device_init_properties(struct vn_physical_device *physical_dev)
/* Vulkan 1.4 */
if (renderer_version >= VK_API_VERSION_1_4) {
local_props.vulkan_1_4.copySrcLayoutCount = ARRAY_SIZE(physical_dev->copy_src_layouts);
local_props.vulkan_1_4.pCopySrcLayouts = physical_dev->copy_src_layouts;
local_props.vulkan_1_4.copyDstLayoutCount = ARRAY_SIZE(physical_dev->copy_dst_layouts);
local_props.vulkan_1_4.pCopyDstLayouts = physical_dev->copy_dst_layouts;
VN_ADD_PNEXT(props2, VULKAN_1_4_PROPERTIES, local_props.vulkan_1_4);
} else {
if (exts->EXT_host_image_copy) {
local_props.host_image_copy.copySrcLayoutCount = ARRAY_SIZE(physical_dev->copy_src_layouts);
local_props.host_image_copy.pCopySrcLayouts = physical_dev->copy_src_layouts;
local_props.host_image_copy.copyDstLayoutCount = ARRAY_SIZE(physical_dev->copy_dst_layouts);
local_props.host_image_copy.pCopyDstLayouts = physical_dev->copy_dst_layouts;
}
VN_ADD_PNEXT_EXT(props2, HOST_IMAGE_COPY_PROPERTIES, local_props.host_image_copy, exts->EXT_host_image_copy);
VN_ADD_PNEXT_EXT(props2, LINE_RASTERIZATION_PROPERTIES, local_props.line_rasterization, exts->KHR_line_rasterization || exts->EXT_line_rasterization);
VN_ADD_PNEXT_EXT(props2, MAINTENANCE_5_PROPERTIES, local_props.maintenance_5, exts->KHR_maintenance5);
VN_ADD_PNEXT_EXT(props2, MAINTENANCE_6_PROPERTIES, local_props.maintenance_6, exts->KHR_maintenance6);
@ -633,6 +634,7 @@ vn_physical_device_init_properties(struct vn_physical_device *physical_dev)
if (renderer_version >= VK_API_VERSION_1_4) {
VN_SET_VK_PROPS(props, &local_props.vulkan_1_4);
} else {
VN_SET_VK_PROPS_EXT(props, &local_props.host_image_copy, exts->EXT_host_image_copy);
VN_SET_VK_PROPS_EXT(props, &local_props.line_rasterization, exts->KHR_line_rasterization || exts->EXT_line_rasterization);
VN_SET_VK_PROPS_EXT(props, &local_props.maintenance_5, exts->KHR_maintenance5);
VN_SET_VK_PROPS_EXT(props, &local_props.maintenance_6, exts->KHR_maintenance6);
@ -1044,6 +1046,8 @@ vn_physical_device_get_passthrough_extensions(
const struct vn_physical_device *physical_dev,
struct vk_device_extension_table *exts)
{
struct vn_renderer *renderer = physical_dev->instance->renderer;
*exts = (struct vk_device_extension_table){
/* promoted to VK_VERSION_1_1 */
.KHR_16bit_storage = true,
@ -1134,17 +1138,8 @@ vn_physical_device_get_passthrough_extensions(
.KHR_shader_float_controls2 = true,
.KHR_shader_subgroup_rotate = true,
.KHR_vertex_attribute_divisor = true,
/* The implementation would be inefficient via venus due to too many
* memcpy and roundtrips. Venus favors device side copy and blit so that
* they can be batched for optimal performance. Meanwhile, supporting
* this extension requires new venus protocol level support to handle
* implicitly sized host pointers as well as filling returned blob
* inside "in" structs. e.g. info structs are usually "in" structs while
* properties structs are usually "out" structs. So venus won't
* implement host copy but will always emulate an additional queue that
* supports VK_QUEUE_TRANSFER_BIT to satisfy Vulkan 1.4 requirements.
*/
.EXT_host_image_copy = false,
.EXT_host_image_copy =
renderer->info.vk_mesa_venus_protocol_spec_version >= 3,
.EXT_pipeline_protected_access = true,
.EXT_pipeline_robustness = true,

4
src/virtio/vulkan/vn_physical_device.h
View file

@ -81,6 +81,10 @@ struct vn_physical_device {
VkDriverId renderer_driver_id;
/* Static storage so that host copy properties query can be done once. */
VkImageLayout copy_src_layouts[64];
VkImageLayout copy_dst_layouts[64];
VkQueueFamilyProperties2 *queue_family_properties;
VkQueueFamilyGlobalPriorityProperties *global_priority_properties;
uint32_t queue_family_count;